Skip to content

Commit 952d3d1

Browse files
authored
Fix build deprecations (#212)
Co-authored-by: hfhbd <[email protected]>
1 parent e251b7f commit 952d3d1

File tree

6 files changed

+4
-18
lines changed

6 files changed

+4
-18
lines changed

.github/workflows/CD.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
run: long="${{ github.ref }}"; version=${long#"refs/tags/v"}; echo "version=${version}" >> $GITHUB_ENV
2424
- uses: actions/checkout@v3
2525
- uses: gradle/wrapper-validation-action@v1
26-
- uses: actions/setup-java@v3
27-
with:
28-
distribution: 'adopt'
29-
java-version: 11
3026
- uses: gradle/gradle-build-action@v2
3127
- name: Build with Gradle
3228
run: ./gradlew build

.github/workflows/CI.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v3
2020
- uses: gradle/wrapper-validation-action@v1
21-
- uses: actions/setup-java@v3
22-
with:
23-
distribution: 'adopt'
24-
java-version: 11
2521
- uses: gradle/gradle-build-action@v2
2622
- name: Build with Gradle
2723
run: ./gradlew build

.github/workflows/Docs.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ jobs:
2424
- uses: actions/configure-pages@v3
2525
- uses: actions/checkout@v3
2626
- uses: gradle/wrapper-validation-action@v1
27-
- uses: actions/setup-java@v3
28-
with:
29-
distribution: 'adopt'
30-
java-version: 11
3127
- uses: gradle/gradle-build-action@v2
3228
- name: Generate Docs
33-
run: ./gradlew dokkaHtmlMultimodule
29+
run: ./gradlew dokkaHtmlMultiModule
3430
- name: Upload Docs
3531
uses: actions/upload-pages-artifact@v1
3632
with:

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import io.gitlab.arturbosch.detekt.*
66
*/
77

88
plugins {
9-
kotlin("multiplatform") apply false
109
id("org.jetbrains.kotlinx.binary-compatibility-validator")
1110
id("io.github.gradle-nexus.publish-plugin")
1211
id("org.jetbrains.dokka")
@@ -19,7 +18,7 @@ tasks.dokkaHtmlMultiModule {
1918
}
2019

2120
nexusPublishing {
22-
repositories {
21+
this.repositories {
2322
sonatype {
2423
username.set(System.getProperty("sonartype.apiKey") ?: System.getenv("SONARTYPE_APIKEY"))
2524
password.set(System.getProperty("sonartype.apiToken") ?: System.getenv("SONARTYPE_APITOKEN"))
@@ -30,7 +29,7 @@ nexusPublishing {
3029
}
3130

3231
detekt {
33-
source = files(rootProject.rootDir)
32+
source.from(files(rootProject.rootDir))
3433
parallel = true
3534
autoCorrect = true
3635
buildUponDefaultConfig = true

gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ plugins {
66

77
plugins.apply("org.jetbrains.kotlin.multiplatform")
88

9-
the<KotlinMultiplatformExtension>().apply {
9+
extensions.configure<KotlinMultiplatformExtension>("kotlin") {
1010
kotlinConfig()
1111
}

gradle/build-logic/src/main/kotlin/publish.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ publishing {
4040
(System.getProperty("signing.privateKey") ?: System.getenv("SIGNING_PRIVATE_KEY"))?.let {
4141
String(java.util.Base64.getDecoder().decode(it)).trim()
4242
}?.let { key ->
43-
println("found key, config signing")
4443
signing {
4544
val signingPassword = System.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD")
4645
useInMemoryPgpKeys(key, signingPassword)

0 commit comments

Comments
 (0)