diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml index 9950932..4daa194 100644 --- a/.github/workflows/ossf-scorecard.yml +++ b/.github/workflows/ossf-scorecard.yml @@ -43,6 +43,6 @@ jobs: retention-days: 5 - name: Upload to code-scanning - uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5 + uses: github/codeql-action/upload-sarif@v4.31.9 with: sarif_file: results.sarif diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a899eea..dcc8014 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,7 @@ android { defaultConfig { applicationId = "com.justeattakeaway.intervalannotatedstring.sampleapp" - minSdk = 21 + minSdk = 23 targetSdk = 36 versionCode = 1 versionName = "1.0" diff --git a/gradle.properties b/gradle.properties index 022b8fd..d8ce286 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ android.nonTransitiveRClass=true publish.groupId=com.justeattakeaway publish.artifactId=interval-annotated-string -publish.versionName=0.1.0 +publish.versionName=0.2.0-alpha01 publish.pom.name=Interval Annotated String publish.pom.description=This small Android utility library makes it easy to create and manage embedded links and styles within localized text. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36588f2..092f11f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,17 +2,17 @@ agp = "8.13.2" annotation = "1.9.1" junitparams = "1.1.1" -kotlin = "2.2.21" +kotlin = "2.3.0" coreKtx = "1.17.0" junit = "4.13.2" -compose = "1.9.4" +compose = "1.10.0" material = "1.13.0" materialIconsExtended = "1.7.8" mockk = "1.14.7" detekt = "1.23.8" -lifecycleRuntimeKtx = "2.9.4" -activityCompose = "1.11.0" -composeBom = "2025.10.01" +lifecycleRuntimeKtx = "2.10.0" +activityCompose = "1.12.2" +composeBom = "2025.12.01" binary-compatibility-validator = "0.18.1" dependency-guard = "0.5.0" diff --git a/intervalannotatedstring/dependencies/releaseRuntimeClasspath.txt b/intervalannotatedstring/dependencies/releaseRuntimeClasspath.txt index 686dddb..2053077 100644 --- a/intervalannotatedstring/dependencies/releaseRuntimeClasspath.txt +++ b/intervalannotatedstring/dependencies/releaseRuntimeClasspath.txt @@ -9,35 +9,42 @@ androidx.autofill:autofill:1.0.0 androidx.collection:collection-jvm:1.5.0 androidx.collection:collection-ktx:1.5.0 androidx.collection:collection:1.5.0 -androidx.compose.runtime:runtime-android:1.9.4 -androidx.compose.runtime:runtime-annotation-android:1.9.4 -androidx.compose.runtime:runtime-annotation:1.9.4 -androidx.compose.runtime:runtime-saveable-android:1.9.4 -androidx.compose.runtime:runtime-saveable:1.9.4 -androidx.compose.runtime:runtime:1.9.4 -androidx.compose.ui:ui-android:1.9.4 -androidx.compose.ui:ui-geometry-android:1.9.4 -androidx.compose.ui:ui-geometry:1.9.4 -androidx.compose.ui:ui-graphics-android:1.9.4 -androidx.compose.ui:ui-graphics:1.9.4 -androidx.compose.ui:ui-text-android:1.9.4 -androidx.compose.ui:ui-text:1.9.4 -androidx.compose.ui:ui-unit-android:1.9.4 -androidx.compose.ui:ui-unit:1.9.4 -androidx.compose.ui:ui-util-android:1.9.4 -androidx.compose.ui:ui-util:1.9.4 -androidx.compose.ui:ui:1.9.4 +androidx.compose.runtime:runtime-android:1.10.0 +androidx.compose.runtime:runtime-annotation-android:1.10.0 +androidx.compose.runtime:runtime-annotation:1.10.0 +androidx.compose.runtime:runtime-retain-android:1.10.0 +androidx.compose.runtime:runtime-retain:1.10.0 +androidx.compose.runtime:runtime-saveable-android:1.10.0 +androidx.compose.runtime:runtime-saveable:1.10.0 +androidx.compose.runtime:runtime:1.10.0 +androidx.compose.ui:ui-android:1.10.0 +androidx.compose.ui:ui-geometry-android:1.10.0 +androidx.compose.ui:ui-geometry:1.10.0 +androidx.compose.ui:ui-graphics-android:1.10.0 +androidx.compose.ui:ui-graphics:1.10.0 +androidx.compose.ui:ui-text-android:1.10.0 +androidx.compose.ui:ui-text:1.10.0 +androidx.compose.ui:ui-unit-android:1.10.0 +androidx.compose.ui:ui-unit:1.10.0 +androidx.compose.ui:ui-util-android:1.10.0 +androidx.compose.ui:ui-util:1.10.0 +androidx.compose.ui:ui:1.10.0 androidx.concurrent:concurrent-futures:1.1.0 -androidx.core:core-ktx:1.15.0 +androidx.core:core-ktx:1.16.0 androidx.core:core-viewtree:1.0.0 -androidx.core:core:1.15.0 +androidx.core:core:1.16.0 androidx.customview:customview-poolingcontainer:1.0.0 +androidx.documentfile:documentfile:1.0.0 +androidx.dynamicanimation:dynamicanimation:1.0.0 androidx.emoji2:emoji2:1.4.0 androidx.graphics:graphics-path:1.0.1 androidx.interpolator:interpolator:1.0.0 +androidx.legacy:legacy-support-core-utils:1.0.0 androidx.lifecycle:lifecycle-common-jvm:2.9.4 androidx.lifecycle:lifecycle-common:2.9.4 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.4 androidx.lifecycle:lifecycle-livedata-core:2.9.4 +androidx.lifecycle:lifecycle-livedata:2.9.4 androidx.lifecycle:lifecycle-process:2.9.4 androidx.lifecycle:lifecycle-runtime-android:2.9.4 androidx.lifecycle:lifecycle-runtime-compose-android:2.9.4 @@ -50,22 +57,28 @@ androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4 androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.4 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4 androidx.lifecycle:lifecycle-viewmodel:2.9.4 +androidx.loader:loader:1.0.0 +androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 +androidx.print:print:1.0.0 androidx.profileinstaller:profileinstaller:1.4.0 -androidx.savedstate:savedstate-android:1.3.3 -androidx.savedstate:savedstate-compose-android:1.3.3 -androidx.savedstate:savedstate-compose:1.3.3 -androidx.savedstate:savedstate-ktx:1.3.3 -androidx.savedstate:savedstate:1.3.3 +androidx.savedstate:savedstate-android:1.3.2 +androidx.savedstate:savedstate-compose-android:1.3.2 +androidx.savedstate:savedstate-compose:1.3.2 +androidx.savedstate:savedstate-ktx:1.3.2 +androidx.savedstate:savedstate:1.3.2 androidx.startup:startup-runtime:1.1.1 androidx.tracing:tracing:1.2.0 +androidx.transition:transition:1.6.0 androidx.versionedparcelable:versionedparcelable:1.1.1 +androidx.window:window-core-android:1.5.0 +androidx.window:window-core:1.5.0 +androidx.window:window:1.5.0 com.google.guava:listenablefuture:1.0 -org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21 -org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 +org.jetbrains.kotlin:kotlin-stdlib:2.3.0 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3 diff --git a/intervalannotatedstring/src/main/AndroidManifest.xml b/intervalannotatedstring/src/main/AndroidManifest.xml index a5918e6..8072ee0 100644 --- a/intervalannotatedstring/src/main/AndroidManifest.xml +++ b/intervalannotatedstring/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - \ No newline at end of file +