diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa2cbdf..cf42574 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: cache: 'gradle' - name: Validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v4 - uses: maxim-lobanov/setup-xcode@v1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8a57550..230acc8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,7 +33,7 @@ jobs: cache: 'gradle' - name: Validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v4 - name: Update docs/README.md run: cp ./README.md ./docs/README.md diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d550264..518a010 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,7 +35,7 @@ jobs: cache: 'gradle' - name: Validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v4 - uses: maxim-lobanov/setup-xcode@v1 with: @@ -51,7 +51,7 @@ jobs: run: ./gradlew publishToMavenCentral --no-configuration-cache - name: Generate Changelog - uses: mikepenz/release-changelog-builder-action@v4 + uses: mikepenz/release-changelog-builder-action@v5 id: build_changelog with: commitMode: true diff --git a/build.gradle.kts b/build.gradle.kts index d53965e..3e4b967 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -122,7 +122,7 @@ versionCatalogUpdate { } atomicfu { - dependenciesVersion = libs.versions.kotlinx.atomicfu.get() + dependenciesVersion = libs.versions.atomicfu.get() transformJvm = false jvmVariant = "VH" transformJs = false diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index ba9bc6b..982c20e 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -18,7 +18,7 @@ object Config { const val majorRelease = 2 const val minorRelease = 0 const val patch = 0 - const val postfix = "-beta02" + const val postfix = "" // include dash const val versionName = "$majorRelease.$minorRelease.$patch$postfix" const val url = "https://github.com/respawn-app/ApiResult" const val licenseName = "The Apache Software License, Version 2.0" diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 83e1b39..951e098 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("pro.respawn.shared-library") alias(libs.plugins.maven.publish) + // alias(libs.plugins.atomicfu) } android { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 643759c..10180ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -compose = "1.6.10" +compose = "1.7.0-beta07" compose-activity = "1.9.1" compose-material3 = "1.3.0-beta05" composeDetektPlugin = "1.3.0" @@ -9,12 +9,12 @@ dependencyAnalysisPlugin = "1.32.0" detekt = "1.23.6" detektFormattingPlugin = "1.23.6" dokka = "1.9.20" -gradleAndroid = "8.6.0-beta02" +gradleAndroid = "8.6.0-rc01" gradleDoctorPlugin = "0.10.0" kotest = "5.9.1" # @pin -kotlin = "2.0.0" -kotlinx-atomicfu = "0.23.1" +kotlin = "2.0.10" +atomicfu = "0.25.0" lifecycle = "2.8.4" maven-publish-plugin = "0.29.0" turbine = "1.0.0" @@ -59,7 +59,7 @@ unittest = [ ] [plugins] -atomicfu = { id = "kotlinx-atomicfu", version.ref = "kotlinx-atomicfu" } +atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysisPlugin" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 9647f41..c969e85 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,19 +7,6 @@ pluginManagement { mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } - - // TODO: https://github.com/Kotlin/kotlinx-atomicfu/issues/56 - resolutionStrategy { - eachPlugin { - val module = when (requested.id.id) { - "kotlinx-atomicfu" -> "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}" - else -> null - } - if (module != null) { - useModule(module) - } - } - } } dependencyResolutionManagement {