Skip to content

Commit

Permalink
2.0.0 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nek-12 committed Aug 8, 2024
2 parents d9d87d6 + c5ad6c2 commit 9d7ff03
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ versionCatalogUpdate {
}

atomicfu {
dependenciesVersion = libs.versions.kotlinx.atomicfu.get()
dependenciesVersion = libs.versions.atomicfu.get()
transformJvm = false
jvmVariant = "VH"
transformJs = false
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("pro.respawn.shared-library")
alias(libs.plugins.maven.publish)
// alias(libs.plugins.atomicfu)
}

android {
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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" }
Expand Down
13 changes: 0 additions & 13 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9d7ff03

Please sign in to comment.