WTA #44: Updated lib versions and fixed previews not loading.

Jacob3075 · Oct 29, 2022 · 0f485e9 · 0f485e9
1 parent 98f3db1
commit 0f485e9
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 33 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("wakatimeapp.android.application")
 }
 
+android {
+    namespace = "com.jacob.wakatimeapp"
+}
+
 dependencies {
     implementation(project(":core:models"))
     implementation(project(":core:common"))
@@ -13,7 +17,7 @@ dependencies {
 
     implementation("androidx.core:core-splashscreen:1.0.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
 
     // Core Testing
     testImplementation("junit:junit:4.13.2")
@@ -24,7 +28,7 @@ dependencies {
     androidTestImplementation("androidx.test:runner:1.4.0")
     androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.1")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.0")
     androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0")
 
     androidTestImplementation("com.google.dagger:hilt-android-testing:2.42")
@@ -33,10 +37,4 @@ dependencies {
     androidTestImplementation("com.google.truth:truth:1.1.3")
     androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")
     androidTestImplementation("io.mockk:mockk-android:1.12.4")
-
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.1")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.2.1")
-}
-android {
-    namespace = "com.jacob.wakatimeapp"
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     implementation("com.android.tools.build:gradle:8.0.0-alpha06")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
 
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.10")
+    implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.20")
     implementation("com.google.devtools.ksp:symbol-processing-api:1.7.10-1.0.6")
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0-RC1")
 

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.application.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.application.gradle
@@ -63,15 +63,18 @@ dependencies {
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
+    implementation("com.google.android.material:material:1.7.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
-    implementation("androidx.activity:activity-compose:1.6.0")
+    implementation("androidx.compose.ui:ui:1.3.0")
+    implementation("androidx.compose.material3:material3:1.0.0")
+    implementation("androidx.activity:activity-compose:1.6.1")
+
+    implementation("androidx.compose.ui:ui-tooling-preview:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:1.3.0")
 
     // Navigation
     implementation("io.github.raamcosta.compose-destinations:core:1.6.19-beta")
@@ -85,6 +88,7 @@ dependencies {
     implementation("com.jakewharton.timber:timber:5.0.1")
 
     implementation("io.arrow-kt:arrow-core:1.0.1")
+
 }
 
 kapt {

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.feature.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.feature.gradle
@@ -53,18 +53,21 @@ dependencies {
     implementation(project(":core:common"))
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
+    implementation("com.google.android.material:material:1.7.0")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
-    implementation("androidx.activity:activity-compose:1.6.0")
+    implementation("androidx.compose.ui:ui:1.3.0")
+    implementation("androidx.compose.material3:material3:1.0.0")
+    implementation("androidx.activity:activity-compose:1.6.1")
+
+    implementation("androidx.compose.ui:ui-tooling-preview:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:1.3.0")
 
     // Hilt
     implementation("com.google.dagger:hilt-android:2.43.1")
@@ -96,6 +99,9 @@ dependencies {
     testImplementation("io.kotest.extensions:kotest-assertions-arrow:1.2.5")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
+
+    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:1.3.0")
 }
 
 kapt {

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.library.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.library.gradle
@@ -30,7 +30,7 @@ android {
 
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("wakatimeapp.android.library")
 }
 
+android {
+    namespace = "com.jacob.wakatimeapp.core.common"
+}
+
 dependencies {
     implementation(project(":core:models"))
 
@@ -25,6 +29,3 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
 }
-android {
-    namespace = "com.jacob.wakatimeapp.core.common"
-}
diff --git a/core/models/build.gradle.kts b/core/models/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("wakatimeapp.android.library")
 }
 
-dependencies {
-}
 android {
     namespace = "com.jacob.wakatimeapp.core.models"
 }
+
+dependencies {
+}
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -18,14 +18,14 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
+    implementation("com.google.android.material:material:1.7.0")
+    implementation("androidx.compose.material3:material3:1.0.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
+    implementation("androidx.compose.ui:ui:1.3.0")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.3.0")
 
     implementation("com.airbnb.android:lottie-compose:5.0.3")
 

diff --git a/details/build.gradle.kts b/details/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("wakatimeapp.android.feature")
 }
 
-dependencies {
-}
 android {
     namespace = "com.jacob.wakatimeapp.details"
 }
+
+dependencies {
+}
diff --git a/home/build.gradle.kts b/home/build.gradle.kts
@@ -8,7 +8,7 @@ android {
 
 dependencies {
     // Image Loading, Charts, Lottie Animations
-    implementation("io.coil-kt:coil-compose:2.1.0")
+    implementation("io.coil-kt:coil-compose:2.2.2")
     implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
 
     implementation("androidx.datastore:datastore-preferences:1.0.0")