diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 69e8615..ae3f30a 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/README.md b/README.md index 7470006..067ef2f 100644 --- a/README.md +++ b/README.md @@ -152,10 +152,10 @@ repositories { dependencies { // Use this library and BasicTextFlow() if you don't want a dependency on material3 - implementation 'dev.romainguy:combo-breaker:0.8.0' + implementation 'dev.romainguy:combo-breaker:0.9.0' // Use this library and TextFlow() if you use material3 - implementation 'dev.romainguy:combo-breaker-material3:0.8.0' + implementation 'dev.romainguy:combo-breaker-material3:0.9.0' } ``` diff --git a/build.gradle b/build.gradle index 800415d..3f073bd 100644 --- a/build.gradle +++ b/build.gradle @@ -2,21 +2,21 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { ext { - compose_bom = '2023.04.01' - core_ktx_version = '1.10.0' - compose_compiler_version = '1.4.6' + compose_bom = '2023.10.01' + core_ktx_version = '1.12.0' + compose_compiler_version = '1.5.6' } dependencies { - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.24.0' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.10' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20' } } plugins { - id 'com.android.application' version '8.1.0-alpha11' apply false - id 'com.android.library' version '8.1.0-alpha11' apply false - id 'org.jetbrains.kotlin.android' version '1.8.20' apply false + id 'com.android.application' version '8.2.0' apply false + id 'com.android.library' version '8.2.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.21' apply false } subprojects { diff --git a/combo-breaker-demo/build.gradle b/combo-breaker-demo/build.gradle index 6aba604..d67abdc 100644 --- a/combo-breaker-demo/build.gradle +++ b/combo-breaker-demo/build.gradle @@ -6,12 +6,12 @@ plugins { android { namespace 'dev.romainguy.text.combobreaker.demo' - compileSdkPreview 'UpsideDownCake' - defaultConfig { applicationId 'dev.romainguy.text.combobreaker.demo' minSdk 29 - targetSdk 33 + targetSdk 34 + compileSdk 34 + versionCode 1 versionName '1.0' @@ -21,10 +21,10 @@ android { } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } } compileOptions { @@ -58,10 +58,10 @@ dependencies { implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.material3:material3' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.activity:activity-compose:1.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.activity:activity-compose:1.8.1' - implementation 'dev.romainguy:pathway:0.11.0' + implementation 'dev.romainguy:pathway:0.17.0' implementation project(path: ':combo-breaker-material3') } diff --git a/combo-breaker-demo/src/main/java/dev/romainguy/text/combobreaker/demo/ComboBreakerActivity.kt b/combo-breaker-demo/src/main/java/dev/romainguy/text/combobreaker/demo/ComboBreakerActivity.kt index 57cf6db..a59f471 100644 --- a/combo-breaker-demo/src/main/java/dev/romainguy/text/combobreaker/demo/ComboBreakerActivity.kt +++ b/combo-breaker-demo/src/main/java/dev/romainguy/text/combobreaker/demo/ComboBreakerActivity.kt @@ -203,7 +203,7 @@ class ComboBreakerActivity : ComponentActivity() { style = LocalTextStyle.current.merge( TextStyle( color = colorScheme.onSurface, - fontSize = if (useMultipleShapes) 12.sp else LocalTextStyle.current.fontSize + fontSize = if (useMultipleShapes) 13.sp else LocalTextStyle.current.fontSize ) ), justification = justification, diff --git a/combo-breaker-material3/build.gradle b/combo-breaker-material3/build.gradle index 74e30e2..7dd603f 100644 --- a/combo-breaker-material3/build.gradle +++ b/combo-breaker-material3/build.gradle @@ -10,11 +10,10 @@ version = VERSION_NAME android { namespace 'dev.romainguy.text.combobreaker.material3' - compileSdkPreview 'UpsideDownCake' - defaultConfig { minSdk 29 - targetSdk 33 + targetSdk 34 + compileSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/combo-breaker/build.gradle b/combo-breaker/build.gradle index f95d135..f2b6f08 100644 --- a/combo-breaker/build.gradle +++ b/combo-breaker/build.gradle @@ -10,11 +10,10 @@ version = VERSION_NAME android { namespace 'dev.romainguy.text.combobreaker' - compileSdkPreview 'UpsideDownCake' - defaultConfig { minSdk 29 - targetSdk 33 + targetSdk 34 + compileSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/gradle.properties b/gradle.properties index 8d2e84a..1d14571 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=dev.romainguy -VERSION_NAME=0.8.0 +VERSION_NAME=0.9.0 SONATYPE_HOST=S01 RELEASE_SIGNING_ENABLED=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 35c7070..6a9261d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 22 12:55:00 PDT 2022 +#Tue Dec 12 18:11:49 PST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists