Updated gradle wrapper and cleaned up files

app/build.gradle.kts

@@ -9,17 +9,16 @@ plugins {
 android {
     namespace = "com.rtbishop.look4sat"
     compileSdk = 33
-
     defaultConfig {
         applicationId = "com.rtbishop.look4sat"
         minSdk = 21
         targetSdk = 33
         versionCode = 313
         versionName = "3.1.3"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     buildTypes {
@@ -33,53 +32,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-    testOptions {
-        unitTests {
-            all { it.useJUnitPlatform() }
-            isIncludeAndroidResources = true
-            isReturnDefaultValues = true
-        }
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
-    }
-    packaging {
-        resources {
-            excludes += listOf(
-                "/META-INF/{AL2.0,LGPL2.1}",
-                "META-INF/DEPENDENCIES.txt",
-                "META-INF/LICENSE.txt",
-                "META-INF/NOTICE.txt",
-                "META-INF/NOTICE",
-                "META-INF/LICENSE",
-                "META-INF/DEPENDENCIES",
-                "META-INF/notice.txt",
-                "META-INF/license.txt",
-                "META-INF/dependencies.txt",
-                "META-INF/LGPL2.1",
-                "META-INF/maven/commons-io/commons-io/pom.xml",
-                "META-INF/maven/commons-io/commons-io/pom.properties"
-            )
-        }
-    }
-}
-
-kotlin {
-    jvmToolchain(17)
+    composeOptions { kotlinCompilerExtensionVersion = "1.4.7" }
+    packaging { resources { excludes += listOf("META-INF/{AL2.0,LGPL2.1}") } }
 }
 
 dependencies {
     implementation(project(":data"))
     implementation(project(":domain"))
-    // Android
+
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.room:room-runtime:2.5.2")
     implementation("androidx.room:room-ktx:2.5.2")
     ksp("androidx.room:room-compiler:2.5.2")
-    // Compose
+
     implementation("androidx.activity:activity-compose:1.7.2")
     implementation("androidx.compose.animation:animation:1.4.3")
     implementation("androidx.compose.compiler:compiler:1.5.1")
@@ -88,13 +53,13 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
     implementation("androidx.navigation:navigation-compose:2.6.0")
-    // Utility
+
     implementation("com.squareup.okhttp3:okhttp:4.10.0")
     implementation("org.osmdroid:osmdroid-android:6.1.16")
     debugImplementation("androidx.compose.ui:ui-tooling:1.4.3")
     debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.3")
     debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
-    // Test
+
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.13.5")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")

app/proguard-rules.pro

@@ -1,11 +1,14 @@
-# Please add these rules to your existing keep rules in order to suppress warnings.
-# This is generated automatically by the Android Gradle plugin.
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz
+
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+
+# OkHttp platform used only on JVM and when Conscrypt and other security providers are available.
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**