Kotlin 1.8.22 support

jeppeman · Jul 3, 2023 · b1bd94e · b1bd94e
1 parent 03dd9f0
commit b1bd94e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Run tests
         run: ./gradlew -p mockposable test
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,36 @@ buildscript {
     }
 }
 
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+    }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
+
+    tasks.withType(Test::class.java).configureEach {
+        testLogging {
+            exceptionFormat = TestExceptionFormat.FULL
+            showCauses = true
+            showExceptions = true
+            showStackTraces = true
+            showStandardStreams = true
+            events = setOf(
+                TestLogEvent.PASSED,
+                TestLogEvent.SKIPPED,
+                TestLogEvent.FAILED,
+                TestLogEvent.STANDARD_OUT,
+                TestLogEvent.STANDARD_ERROR
+            )
+        }
+    }
+}
+
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     kotlin("jvm") version libs.versions.kotlin.get() apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-kotlin = '1.8.21'
+kotlin = '1.8.22'
 compose-ui = '1.4.3'
-compose-compiler = '1.4.7'
-google-ksp = '1.8.21-1.0.11'
+compose-compiler = '1.4.8'
+google-ksp = '1.8.22-1.0.11'
 activity = '1.6.1'
 espresso = '3.4.0'
 hamcrest = '2.2'
@@ -23,7 +23,7 @@ androidx-test-espresso-core = { module = 'androidx.test.espresso:espresso-core',
 androidx-fragment-testing = { module = 'androidx.fragment:fragment-testing', version = '1.5.4' }
 
 compose-compiler = { module = 'androidx.compose.compiler:compiler', version.ref = 'compose-compiler' }
-compose-runtime = { module = 'org.jetbrains.compose.runtime:runtime', version = '1.4.0' }
+compose-runtime = { module = 'org.jetbrains.compose.runtime:runtime', version = '1.4.1' }
 compose-ui = { module = 'androidx.compose.ui:ui', version.ref = 'compose-ui' }
 compose-material = { module = 'androidx.compose.material:material', version = '1.4.0' }
 compose-foundation = { module = 'androidx.compose.foundation:foundation', version = '1.4.0' }

diff --git a/integration-tests/android/build.gradle.kts b/integration-tests/android/build.gradle.kts
@@ -52,8 +52,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 

diff --git a/mockposable/build.gradle.kts b/mockposable/build.gradle.kts
@@ -29,7 +29,7 @@ allprojects {
 
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions {
-            jvmTarget = "11"
+            jvmTarget = "17"
         }
     }
 

diff --git a/mockposable/gradle.properties b/mockposable/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.5-SNAPSHOT
+VERSION_NAME=0.6-SNAPSHOT
 GROUP=com.jeppeman.mockposable
 
 POM_DESCRIPTION=A tool that enables stubbing and verification of @Composable-annotated functions

diff --git a/mockposable/mockposable-compiler/build.gradle.kts b/mockposable/mockposable-compiler/build.gradle.kts
@@ -16,8 +16,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/mockposable/mockposable-runtime/mockposable-runtime-composeui/build.gradle.kts b/mockposable/mockposable-runtime/mockposable-runtime-composeui/build.gradle.kts
@@ -26,8 +26,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }