Merge pull request #669 from ZacSweers/z/updateFinal

Update to Kotlin 1.8.0 (+ KCT) final
square · Jan 3, 2023 · 3fdaf27 · 3fdaf27
2 parents 071b468 + 29bdefe
commit 3fdaf27
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs :
     strategy :
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.7.20, 1.8.0-RC ]
+        kotlin-version : [ 1.7.20, 1.8.0 ]
 
     steps :
       - uses : actions/checkout@v2
@@ -176,7 +176,7 @@ jobs :
           ORG_GRADLE_PROJECT_mavenCentralPassword : ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
 
       - name : Publish Snapshots 1.8
-        run : ./gradlew clean publish --no-build-cache --no-daemon --stacktrace --no-parallel -Psquare.kotlinVersion=1.8.0-RC -PVERSION_NAME=2.4.4-1-8-0-RC-SNAPSHOT && cd gradle-plugin && ./gradlew clean publish --no-build-cache --no-daemon --stacktrace -Psquare.kotlinVersion=1.8.0-RC -PVERSION_NAME=2.4.4-1-8-0-RC-SNAPSHOT && cd ..
+        run : ./gradlew clean publish --no-build-cache --no-daemon --stacktrace --no-parallel -Psquare.kotlinVersion=1.8.0 -PVERSION_NAME=2.4.4-1-8-0-SNAPSHOT && cd gradle-plugin && ./gradlew clean publish --no-build-cache --no-daemon --stacktrace -Psquare.kotlinVersion=1.8.0 -PVERSION_NAME=2.4.4-1-8-0-SNAPSHOT && cd ..
         env :
           ORG_GRADLE_PROJECT_mavenCentralUsername : ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword : ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
@@ -195,7 +195,7 @@ jobs :
       # solution.
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.7.20, 1.8.0-RC ]
+        kotlin-version : [ 1.7.20, 1.8.0 ]
         agp-version : [ 4.2.2, 7.0.4, 7.1.1, 7.2.0-beta01, 7.3.0-alpha01 ]
 
     steps :
@@ -246,7 +246,7 @@ jobs :
       # solution.
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.7.20, 1.8.0-RC ]
+        kotlin-version : [ 1.7.20, 1.8.0 ]
 
     steps :
       - uses : actions/checkout@v2

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,7 +30,7 @@ jobs :
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword : ''
 
       - name : Publish Release 1.8
-        run : ./gradlew clean publish --no-build-cache --no-daemon --stacktrace --no-parallel -Psquare.kotlinVersion=1.8.0-RC -PVERSION_NAME=2.4.4-1-8-0-RC && cd gradle-plugin && ./gradlew clean publish --no-build-cache --no-daemon --stacktrace -Psquare.kotlinVersion=1.8.0-RC -PVERSION_NAME=2.4.4-1-8-0-RC && cd ..
+        run : ./gradlew clean publish --no-build-cache --no-daemon --stacktrace --no-parallel -Psquare.kotlinVersion=1.8.0 -PVERSION_NAME=2.4.4-1-8-0 && cd gradle-plugin && ./gradlew clean publish --no-build-cache --no-daemon --stacktrace -Psquare.kotlinVersion=1.8.0 -PVERSION_NAME=2.4.4-1-8-0 && cd ..
         env :
           ORG_GRADLE_PROJECT_mavenCentralUsername : ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword : ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -86,7 +86,7 @@ ext {
       kotlin: [
           annotation_processing_embeddable: "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$kotlinVersion",
           compile_testing: "com.github.tschuchortdev:kotlin-compile-testing:1.4.9",
-          compile_testing_preview: "dev.zacsweers.kctfork:core:0.1.0-1.8.0-Beta01",
+          compile_testing_preview: "dev.zacsweers.kctfork:core:0.2.0",
           compiler: "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion",
           dokka: "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10",
           gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",