AGP update and minor refactoring

touchlab · Jan 28, 2024 · d8a7a7b · d8a7a7b
1 parent ae9ed66
commit d8a7a7b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 43 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ compileSdk = "34"
 # Dependencies
 kotlin = "1.9.22"
 
-android-gradle-plugin = "8.2.1"
+android-gradle-plugin = "8.2.2"
 ktlint-gradle = "12.1.0"
 
 compose = "1.5.4"

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../shared/"
 
 SPEC CHECKSUMS:
-  shared: ea50f7840493e1a81d5081cf342309e93b0dfa57
+  shared: 81394056467cc83be297c4a24cbe685ad921e677
   SwiftLint: c585ebd615d9520d7fbdbe151f527977b0534f1e
 
 PODFILE CHECKSUM: 3130ca9ec3cd58f2c60cfe8a432d7d96d89938bf
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3
diff --git a/ios/Pods/Local Podspecs/shared.podspec.json b/ios/Pods/Local Podspecs/shared.podspec.json
diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock
diff --git a/ios/Pods/Pods.xcodeproj/project.pbxproj b/ios/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh
diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig
diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig
diff --git a/ios/Pods/Target Support Files/shared/shared.debug.xcconfig b/ios/Pods/Target Support Files/shared/shared.debug.xcconfig
diff --git a/ios/Pods/Target Support Files/shared/shared.release.xcconfig b/ios/Pods/Target Support Files/shared/shared.release.xcconfig
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -63,41 +63,31 @@ kotlin {
             }
         }
 
-        commonMain {
-            dependencies {
-                implementation(libs.koin.core)
-                implementation(libs.coroutines.core)
-                implementation(libs.sqlDelight.coroutinesExt)
-                implementation(libs.bundles.ktor.common)
-                implementation(libs.multiplatformSettings.common)
-                implementation(libs.kotlinx.dateTime)
-                implementation(libs.touchlab.skie.annotations)
-                api(libs.touchlab.kermit)
-            }
+        commonMain.dependencies {
+            implementation(libs.koin.core)
+            implementation(libs.coroutines.core)
+            implementation(libs.sqlDelight.coroutinesExt)
+            implementation(libs.bundles.ktor.common)
+            implementation(libs.multiplatformSettings.common)
+            implementation(libs.kotlinx.dateTime)
+            implementation(libs.touchlab.skie.annotations)
+            api(libs.touchlab.kermit)
         }
-        commonTest {
-            dependencies {
-                implementation(libs.bundles.shared.commonTest)
-            }
+        commonTest.dependencies {
+            implementation(libs.bundles.shared.commonTest)
         }
-        androidMain {
-            dependencies {
-                implementation(libs.androidx.lifecycle.viewmodel)
-                implementation(libs.sqlDelight.android)
-                implementation(libs.ktor.client.okHttp)
-            }
+        androidMain.dependencies {
+            implementation(libs.androidx.lifecycle.viewmodel)
+            implementation(libs.sqlDelight.android)
+            implementation(libs.ktor.client.okHttp)
         }
-        val androidUnitTest by getting {
-            dependencies {
-                implementation(libs.bundles.shared.androidTest)
-            }
+        getByName("androidUnitTest").dependencies {
+            implementation(libs.bundles.shared.androidTest)
         }
-        iosMain {
-            dependencies {
-                implementation(libs.sqlDelight.native)
-                implementation(libs.ktor.client.ios)
-                api(libs.touchlab.kermit.simple)
-            }
+        iosMain.dependencies {
+            implementation(libs.sqlDelight.native)
+            implementation(libs.ktor.client.ios)
+            api(libs.touchlab.kermit.simple)
         }
     }