Merge pull request #16 from RLD-JL/version-1.0.8

Version 1.0.8
RLD-JL · Aug 19, 2024 · f1d4281 · f1d4281
2 parents 444e2de + acf467c
commit f1d4281
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 22 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("kotlin-android")
     kotlin("kapt")
     id("dagger.hilt.android.plugin")
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.10"
 }
 
 dependencies {
@@ -26,9 +27,9 @@ dependencies {
 
 
     implementation("androidx.lifecycle:lifecycle-process:2.6.2")
-    implementation("io.coil-kt:coil-compose:2.1.0")
-    implementation("com.google.dagger:hilt-android:2.42")
-    kapt("com.google.dagger:hilt-android-compiler:2.42")
+    implementation("io.coil-kt:coil-compose:2.7.0")
+    implementation("com.google.dagger:hilt-android:2.52")
+    kapt("com.google.dagger:hilt-android-compiler:2.52")
 
     implementation("com.google.accompanist:accompanist-swiperefresh:0.24.1-alpha")
     implementation("androidx.core:core-splashscreen:1.0.1")
@@ -38,19 +39,19 @@ dependencies {
 kapt {
     correctErrorTypes = true
 }
-
 android {
     compileSdk = 34
     defaultConfig {
         applicationId = "com.rld.justlisten.android"
         minSdk = 21
         targetSdk = 34
-        versionCode = 23
-        versionName = "1.0.7-c"
+        versionCode = 24
+        versionName = "1.0.8"
         vectorDrawables {
             useSupportLibrary = true
         }
     }
+
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -62,13 +63,13 @@ android {
             isShrinkResources = false
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
     kotlinOptions {
         jvmTarget = "17"
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     buildFeatures {
         compose = true
     }
@@ -90,4 +91,12 @@ sourceSets {
             freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
         }
     }
-}
+}
+
+/*
+composeCompiler {
+    enableStrongSkippingMode = true
+
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
+}*/
diff --git a/androidApp/src/main/java/com/rld/justlisten/android/ui/settingsscreen/SettingsScreen.kt b/androidApp/src/main/java/com/rld/justlisten/android/ui/settingsscreen/SettingsScreen.kt
@@ -97,7 +97,7 @@ fun SettingsScreen(
             Row(modifier = Modifier.fillMaxWidth().weight(1f, false),
             horizontalArrangement = Arrangement.Center)
             {
-                Text(text ="App version:1.0.7-b")
+                Text(text ="App version:1.0.8")
             }
         }
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,9 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlinVersion.get()}")
-        classpath("com.android.tools.build:gradle:8.2.0")
+        classpath("com.android.tools.build:gradle:8.5.2")
         classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
-        classpath ("com.google.dagger:hilt-android-gradle-plugin:2.42")
+        classpath ("com.google.dagger:hilt-android-gradle-plugin:2.52")
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jul 22 21:14:22 EEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            version("kotlinVersion", "1.7.0")
+            version("kotlinVersion", "2.0.10")
 
             version("ktorVersion", "2.0.2")
             library("ktor-client-content-negotiation", "io.ktor", "ktor-client-content-negotiation").versionRef("ktorVersion")

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-@Suppress("DSL_SCOPE_VIOLATION")
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
 
     val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget =
         if (System.getenv("SDK_NAME")?.startsWith("iphoneos") == true)
@@ -24,6 +24,7 @@ kotlin {
             }
         }
     }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -44,7 +45,7 @@ kotlin {
                 implementation("com.squareup.sqldelight:android-driver:1.5.3")
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -54,7 +55,6 @@ kotlin {
             dependencies {
                 implementation("io.ktor:ktor-client-ios:${libs.versions.ktorVersion.get()}")
                 implementation("com.squareup.sqldelight:native-driver:1.5.3")
-
             }
         }
         val iosTest by getting
@@ -85,8 +85,12 @@ android {
     compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
+        testOptions.targetSdk = 34
         minSdk = 21
-        targetSdk = 34
     }
     namespace = "com.rld.justlisten"
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
diff --git a/...in/kotlin/com/rld/justlisten/datalayer/webservices/apis/playlistcalls/FetchTopPlaylist.kt b/...in/kotlin/com/rld/justlisten/datalayer/webservices/apis/playlistcalls/FetchTopPlaylist.kt
@@ -31,7 +31,7 @@ suspend fun ApiClient.getTracks(
     timeRange: String
 ): PlayListResponse? {
     val response: PlayListResponse? =
-        getResponse("/full/tracks/trending/EJ57D?genre=${category}&limit=${limit}&time=${timeRange}&app_name=$appName")
+        getResponse("/full/tracks/trending?genre=${category}&limit=${limit}&time=${timeRange}&app_name=$appName")
     return response?.let {
         val tracks = it.data.filter { it.isStreamable }
         PlayListResponse(tracks)