Upgrade to Kotlin 1.8

aeris-consulting · May 27, 2023 · 80aaa20 · 80aaa20
1 parent 1339fbd
commit 80aaa20
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,20 +12,25 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-import org.gradle.api.tasks.testing.logging.TestLogEvent.*
+import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
+import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
+import org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+import org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT
+import org.gradle.api.tasks.testing.logging.TestLogEvent.STARTED
 
 plugins {
     java
-    kotlin("jvm") version "1.4.31"
-    kotlin("kapt") version "1.4.31"
+    kotlin("jvm") version "1.8.0"
+    kotlin("kapt") version "1.8.0"
     id("net.ltgt.apt") version "0.21" apply false
 
-    id("nebula.contacts") version "5.1.0"
-    id("nebula.info") version "9.1.1"
-    id("nebula.maven-publish") version "17.3.3"
-    id("nebula.maven-scm") version "17.3.3"
-    id("nebula.maven-manifest") version "17.3.3"
-    id("nebula.maven-apache-license") version "17.3.3"
+    id("nebula.contacts") version "6.0.0"
+    id("nebula.info") version "11.4.1"
+    id("nebula.maven-publish") version "18.4.0"
+    id("nebula.maven-scm") version "18.4.0"
+    id("nebula.maven-manifest") version "18.4.0"
+    id("nebula.maven-apache-license") version "18.4.0"
     signing
 
     id("org.sonarqube") version "3.3"
@@ -35,8 +40,8 @@ tasks.withType<Wrapper> {
     distributionType = Wrapper.DistributionType.BIN
 }
 
-val target = JavaVersion.VERSION_1_8
-val kotlinCompileTarget = "1.8"
+val target = JavaVersion.VERSION_11
+val kotlinCompileTarget = "11"
 
 allprojects {
     group = "io.aeris-consulting"

diff --git a/catadioptre-annotations/build.gradle.kts b/catadioptre-annotations/build.gradle.kts
@@ -25,8 +25,9 @@ dependencies {
     compileOnly(kotlin("stdlib"))
     compileOnly(project(":catadioptre-kotlin"))
     implementation(project(":catadioptre-java"))
-    implementation("com.squareup:kotlinpoet:1.10.2")
+    implementation("com.squareup:kotlinpoet:1.13.2")
     implementation("com.squareup:kotlinpoet-classinspector-elements:1.9.0")
     implementation("com.squareup:kotlinpoet-metadata-specs:1.9.0")
     implementation("com.squareup:javapoet:1.13.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0")
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/project.version b/project.version
@@ -1 +1 @@
-0.4.2
+0.5.0