Update to Kotlin 1.6.0 and associated library changes (including fixes for some deprecations)

androidFood2Fork/build.gradle.kts

@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion(Application.compileSdk)
+    compileSdk = Application.compileSdk
     defaultConfig {
         applicationId = Application.appId
-        minSdkVersion(Application.minSdk)
-        targetSdkVersion(Application.targetSdk)
+        minSdk = Application.minSdk
+        targetSdk = Application.targetSdk
         versionCode = Application.versionCode
         versionName = Application.versionName
     }
@@ -29,7 +29,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = "1.8"
-        useIR = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = Compose.composeVersion
@@ -63,14 +62,7 @@ dependencies {
 
     implementation(Kotlinx.datetime)
 
-    implementation(Ktor.android)
+    implementation(Ktor.clientCIO)
 
     debugImplementation(SquareUp.leakCanary)
 }
-
-
-
-
-
-
-

buildSrc/src/main/kotlin/Application.kt

@@ -3,6 +3,6 @@ object Application {
     const val versionCode = 1
     const val versionName = "1.0"
     const val minSdk = 21
-    const val compileSdk = 30
+    const val compileSdk = 31
     const val targetSdk = 29
 }

buildSrc/src/main/kotlin/Build.kt

@@ -1,5 +1,5 @@
 object Build {
-    private const val gradleBuildTools = "7.1.0-alpha03"
+    private const val gradleBuildTools = "7.1.0"
     const val buildTools = "com.android.tools.build:gradle:${gradleBuildTools}"
     const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Kotlin.version}"
     const val sqlDelightGradlePlugin = "com.squareup.sqldelight:gradle-plugin:${SQLDelight.sqlDelightVersion}"

buildSrc/src/main/kotlin/Compose.kt

@@ -1,5 +1,5 @@
 object Compose {
-    const val composeVersion = "1.0.0-beta09"
+    const val composeVersion = "1.1.0-rc01"
     const val runtime = "androidx.compose.runtime:runtime:${composeVersion}"
     const val runtimeLiveData = "androidx.compose.runtime:runtime-livedata:${composeVersion}"
     const val ui = "androidx.compose.ui:ui:${composeVersion}"

buildSrc/src/main/kotlin/Hilt.kt

@@ -1,5 +1,5 @@
 object Hilt {
-    const val version = "2.37"
+    const val version = "2.40.5"
     const val hiltAndroid = "com.google.dagger:hilt-android:$version"
     const val hiltCompiler = "com.google.dagger:hilt-compiler:$version"
 

buildSrc/src/main/kotlin/Kotlin.kt

@@ -1,3 +1,3 @@
 object Kotlin {
-    const val version = "1.5.10"
+    const val version = "1.6.0"
 }

buildSrc/src/main/kotlin/Kotlinx.kt

@@ -1,4 +1,4 @@
 object Kotlinx {
-    private const val kotlinxDatetimeVersion = "0.2.1"
+    private const val kotlinxDatetimeVersion = "0.3.2"
     const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:${kotlinxDatetimeVersion}"
 }

buildSrc/src/main/kotlin/Ktor.kt

@@ -1,7 +1,11 @@
 object Ktor {
-    private const val ktorVersion = "1.5.2"
+    private const val ktorVersion = "2.0.0-beta-1"
     const val core = "io.ktor:ktor-client-core:${ktorVersion}"
-    const val clientSerialization = "io.ktor:ktor-client-serialization:${ktorVersion}"
-    const val android = "io.ktor:ktor-client-android:${ktorVersion}"
-    const val ios = "io.ktor:ktor-client-ios:${ktorVersion}"
+    const val jsonSerialization = "io.ktor:ktor-serialization-kotlinx-json:${ktorVersion}"
+    const val contentNegotiation = "io.ktor:ktor-client-content-negotiation:${ktorVersion}"
+    const val clientCIO = "io.ktor:ktor-client-cio:${ktorVersion}"
+    const val clientDarwin = "io.ktor:ktor-client-darwin:${ktorVersion}"
+//    const val clientSerialization = "io.ktor:ktor-client-serialization:${ktorVersion}"
+//    const val android = "io.ktor:ktor-client-android:${ktorVersion}"
+//    const val ios = "io.ktor:ktor-client-ios:${ktorVersion}"
 }

buildSrc/src/main/kotlin/SQLDelight.kt

@@ -1,5 +1,5 @@
 object SQLDelight {
-    const val sqlDelightVersion = "1.4.3"
+    const val sqlDelightVersion = "1.5.3"
     const val runtime = "com.squareup.sqldelight:runtime:${sqlDelightVersion}"
     const val androidDriver = "com.squareup.sqldelight:android-driver:${sqlDelightVersion}"
     const val nativeDriver = "com.squareup.sqldelight:native-driver:${sqlDelightVersion}"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Apr 27 12:58:23 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

iosFood2Fork/Podfile.lock

@@ -22,8 +22,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageSwiftUI: 8a3923c95108312b03a599ec1498754af55a6819
-  shared: 29346581d099b8843a69aab157c4d0577c3c8287
+  shared: 7b4d6aa8aa7ada5f9dae3229e2524d316cb9f063
 
 PODFILE CHECKSUM: 9d85554c190eff2c79cf4349dccaaae321fe44fa
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.0

iosFood2Fork/iosFood2Fork.xcodeproj/project.pbxproj

@@ -427,7 +427,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 8ZVFT372F9;
 				ENABLE_PREVIEWS = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = iosFood2Fork/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -456,7 +455,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 8ZVFT372F9;
 				ENABLE_PREVIEWS = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = iosFood2Fork/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",