Merge pull request #46 from opatry/update-compose

Update compose

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0'
     }
 }
 

wordle-compose-android/build.gradle

@@ -25,10 +25,10 @@ plugins {
     id 'kotlin-android'
 }
 
-def compose_version = '1.0.5'
+def compose_version = '1.2.0'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId 'net.opatry.games.wordle'
@@ -89,18 +89,18 @@ android {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
-    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
 
     implementation "androidx.compose.ui:ui:${compose_version}"
     implementation "androidx.compose.ui:ui-tooling:${compose_version}"
     implementation "androidx.compose.foundation:foundation:${compose_version}"
     implementation "androidx.compose.material:material:${compose_version}"
     implementation 'androidx.activity:activity-compose:1.4.0'
 
-    implementation 'com.google.accompanist:accompanist-insets:0.21.4-beta'
+    implementation 'com.google.accompanist:accompanist-insets:0.25.1'
 
     implementation project(':word-data')
     implementation project(':game-logic')

wordle-compose-desktop/build.gradle

@@ -22,7 +22,7 @@
 
 plugins {
     id 'org.jetbrains.kotlin.jvm'
-    id 'org.jetbrains.compose' version '1.0.0'
+    id 'org.jetbrains.compose' version '1.2.0-alpha01-dev755'
     id 'application'
 }
 
@@ -39,8 +39,13 @@ version '1.0.0'
 dependencies {
     implementation(compose.desktop.currentOs)
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4')
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4') {
+        because 'requires Dispatchers.Main & co at runtime for Jvm'
+        // java.lang.IllegalStateException: Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. 'kotlinx-coroutines-android' and ensure it has the same version as 'kotlinx-coroutines-core'
+        // see also https://github.com/JetBrains/compose-jb/releases/tag/v1.1.1
+    }
+    implementation('com.google.code.gson:gson:2.9.0')
 
     // TODO depends on such icons when compatible with up to date compiler & runtime
     //  For now, having this as dependency leads to `Unresolved reference: loadImageBitmap`