Merge pull request #9 from joreilly/kotlin_1_8

Kotlin 1.8
joreilly · Jan 21, 2023 · 98a3a4a · 98a3a4a
2 parents af4cdf8 + 241b56b
commit 98a3a4a
Show file tree

Hide file tree

Showing 12 changed files with 2,383 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # WordMasterKMP
 
+![kotlin-version](https://img.shields.io/badge/kotlin-1.8.0-orange)
+
 Kotlin Multiplatform sample heavily inspired by [Wordle](https://www.powerlanguage.co.uk/wordle/) game and also [Word Master](https://github.com/octokatherine/word-master) and [wordle-solver](https://github.com/dlew/wordle-solver) samples.  The main game logic/state is included in shared KMP code with basic UI then in following clients
 - iOS (SwiftUI)
 - Android (Jetpack Compose)

diff --git a/androidApp/src/main/java/dev/johnoreilly/wordmaster/androidApp/MainActivity.kt b/androidApp/src/main/java/dev/johnoreilly/wordmaster/androidApp/MainActivity.kt
@@ -1,5 +1,6 @@
 package dev.johnoreilly.wordmaster.androidApp
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -44,6 +45,7 @@ class MainActivity : ComponentActivity() {
     }
 }
 
+@SuppressLint("UnusedMaterialScaffoldPaddingParameter")
 @Composable
 fun MainLayout() {
     Scaffold(

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,8 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}")
-        classpath("com.android.tools.build:gradle:7.1.3")
+        classpath("com.android.tools.build:gradle:7.4.0")
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.0-1.0.8")
         classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutines}")
     }
 }

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -1,16 +1,16 @@
 
 object Versions {
-    const val kotlinVersion = "1.7.20"
+    const val kotlinVersion = "1.8.0"
     const val kotlinCoroutines = "1.6.4"
 
-    const val compose = "1.3.0-rc01"
-    const val composeCompiler = "1.3.2"
-    const val composeDesktopWeb = "1.2.0"
+    const val compose = "1.4.0-alpha03"
+    const val composeCompiler = "1.4.0"
+    const val composeDesktopWeb = "1.3.0-rc05"
     const val navCompose = "2.5.2"
     const val accompanist = "0.26.2-beta"
     const val okio = "3.0.0"
 
-    const val kmpNativeCoroutines = "0.13.1"
+    const val kmpNativeCoroutines = "1.0.0-ALPHA-4"
 
     const val junit = "4.13"
 }