Merge pull request #53 from KevinSchildhorn/AttemptingToUpdateDepende…

…ncies Attempting to update dependencies
KevinSchildhorn · Oct 10, 2024 · de7e0f2 · de7e0f2
2 parents ece2b80 + f397a6d
commit de7e0f2
Show file tree

Hide file tree

Showing 122 changed files with 433 additions and 2,534 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -1,9 +1,13 @@
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.java
+
 plugins {
-    kotlin("multiplatform")
     id("com.android.application")
-    id("org.jetbrains.compose")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
+    kotlin("multiplatform")
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.crashlytics)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.jetbrains.compose)
 }
 
 kotlin {
@@ -12,31 +16,31 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation(project(":shared"))
-                implementation("io.insert-koin:koin-android:3.4.0")
-                implementation("com.google.firebase:firebase-crashlytics:18.6.0")
+                implementation(libs.koin.android)
+                implementation(libs.firebase.crashlytics)
             }
         }
     }
 }
 
 android {
-    compileSdk = (findProperty("android.compileSdk") as String).toInt()
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.kevinschildhorn"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
         applicationId = "com.kevinschildhorn.fotopresenter"
-        minSdk = (findProperty("android.minSdk") as String).toInt()
-        targetSdk = (findProperty("android.targetSdk") as String).toInt()
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(libs.versions.java.get().toInt())
     }
 }
diff --git a/atomik/.gitignore b/atomik/.gitignore
diff --git a/atomik/build.gradle.kts b/atomik/build.gradle.kts
diff --git a/atomik/src/androidMain/AndroidManifest.xml b/atomik/src/androidMain/AndroidManifest.xml
diff --git a/.../src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/EditTextExtensions.kt b/.../src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/EditTextExtensions.kt
diff --git a/.../src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/TextViewExtensions.kt b/.../src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/TextViewExtensions.kt
diff --git a/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/ViewExtensions.kt b/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/atomic/atoms/xml/ViewExtensions.kt
diff --git a/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/color/base/AtomikColor.kt b/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/color/base/AtomikColor.kt
diff --git a/...rc/androidMain/kotlin/com/kevinschildhorn/atomik/typography/AtomikTypographyExtensions.kt b/...rc/androidMain/kotlin/com/kevinschildhorn/atomik/typography/AtomikTypographyExtensions.kt
diff --git a/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/typography/PlatformTypographySet.kt b/atomik/src/androidMain/kotlin/com/kevinschildhorn/atomik/typography/PlatformTypographySet.kt