Skip to content

Commit 9d7ff03

Browse files
authored
2.0.0 (#13)
2 parents d9d87d6 + c5ad6c2 commit 9d7ff03

File tree

8 files changed

+12
-24
lines changed

8 files changed

+12
-24
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
cache: 'gradle'
3030

3131
- name: Validate gradle wrapper
32-
uses: gradle/actions/wrapper-validation@v3
32+
uses: gradle/actions/wrapper-validation@v4
3333

3434
- uses: maxim-lobanov/setup-xcode@v1
3535
with:

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
cache: 'gradle'
3434

3535
- name: Validate gradle wrapper
36-
uses: gradle/actions/wrapper-validation@v3
36+
uses: gradle/actions/wrapper-validation@v4
3737

3838
- name: Update docs/README.md
3939
run: cp ./README.md ./docs/README.md

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cache: 'gradle'
3636

3737
- name: Validate gradle wrapper
38-
uses: gradle/actions/wrapper-validation@v3
38+
uses: gradle/actions/wrapper-validation@v4
3939

4040
- uses: maxim-lobanov/setup-xcode@v1
4141
with:
@@ -51,7 +51,7 @@ jobs:
5151
run: ./gradlew publishToMavenCentral --no-configuration-cache
5252

5353
- name: Generate Changelog
54-
uses: mikepenz/release-changelog-builder-action@v4
54+
uses: mikepenz/release-changelog-builder-action@v5
5555
id: build_changelog
5656
with:
5757
commitMode: true

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ versionCatalogUpdate {
122122
}
123123

124124
atomicfu {
125-
dependenciesVersion = libs.versions.kotlinx.atomicfu.get()
125+
dependenciesVersion = libs.versions.atomicfu.get()
126126
transformJvm = false
127127
jvmVariant = "VH"
128128
transformJs = false

buildSrc/src/main/kotlin/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object Config {
1818
const val majorRelease = 2
1919
const val minorRelease = 0
2020
const val patch = 0
21-
const val postfix = "-beta02"
21+
const val postfix = "" // include dash
2222
const val versionName = "$majorRelease.$minorRelease.$patch$postfix"
2323
const val url = "https://github.com/respawn-app/ApiResult"
2424
const val licenseName = "The Apache Software License, Version 2.0"

core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("pro.respawn.shared-library")
33
alias(libs.plugins.maven.publish)
4+
// alias(libs.plugins.atomicfu)
45
}
56

67
android {

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
compose = "1.6.10"
2+
compose = "1.7.0-beta07"
33
compose-activity = "1.9.1"
44
compose-material3 = "1.3.0-beta05"
55
composeDetektPlugin = "1.3.0"
@@ -9,12 +9,12 @@ dependencyAnalysisPlugin = "1.32.0"
99
detekt = "1.23.6"
1010
detektFormattingPlugin = "1.23.6"
1111
dokka = "1.9.20"
12-
gradleAndroid = "8.6.0-beta02"
12+
gradleAndroid = "8.6.0-rc01"
1313
gradleDoctorPlugin = "0.10.0"
1414
kotest = "5.9.1"
1515
# @pin
16-
kotlin = "2.0.0"
17-
kotlinx-atomicfu = "0.23.1"
16+
kotlin = "2.0.10"
17+
atomicfu = "0.25.0"
1818
lifecycle = "2.8.4"
1919
maven-publish-plugin = "0.29.0"
2020
turbine = "1.0.0"
@@ -59,7 +59,7 @@ unittest = [
5959
]
6060

6161
[plugins]
62-
atomicfu = { id = "kotlinx-atomicfu", version.ref = "kotlinx-atomicfu" }
62+
atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
6363
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
6464
dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysisPlugin" }
6565
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

settings.gradle.kts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ pluginManagement {
77
mavenCentral()
88
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
99
}
10-
11-
// TODO: https://github.com/Kotlin/kotlinx-atomicfu/issues/56
12-
resolutionStrategy {
13-
eachPlugin {
14-
val module = when (requested.id.id) {
15-
"kotlinx-atomicfu" -> "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}"
16-
else -> null
17-
}
18-
if (module != null) {
19-
useModule(module)
20-
}
21-
}
22-
}
2310
}
2411

2512
dependencyResolutionManagement {

0 commit comments

Comments
 (0)