deps: updated dependencies

supersu-man · Jan 4, 2025 · 1835216 · 1835216
1 parent 7b7b00f
commit 1835216
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 38 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,22 +1,19 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
     namespace = "dev.sumanth.spd"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "dev.sumanth.spd"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 16
         versionName = "1.7.2"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
     }
 
     buildTypes {
@@ -26,18 +23,15 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
-    }
     packaging {
         resources {
             excludes += "/META-INF/*"
@@ -46,19 +40,22 @@ android {
 }
 
 dependencies {
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:5.0.0-alpha.3")
-    implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.3")
+    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation("androidx.activity:activity-compose:1.9.3")
+    implementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    implementation("androidx.compose.ui:ui:1.7.6")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling:1.7.6")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3:1.3.1")
+
+    implementation("com.squareup.okhttp3:okhttp-urlconnection:5.0.0-alpha.14")
+    implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.14")
     implementation("com.github.supersu-man:apkupdater-library:v2.0.1")
     implementation("se.michaelthelin.spotify:spotify-web-api-java:8.0.0")
-    implementation("com.github.teamnewpipe:NewPipeExtractor:v0.24.2")
+    implementation("com.github.teamnewpipe:NewPipeExtractor:v0.24.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
 
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.activity:activity-compose:1.9.3")
-    implementation(platform("androidx.compose:compose-bom:2024.10.00"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,13 +11,13 @@
 
     <application
         android:allowBackup="true"
-        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/Theme.SpotifyPlaylistDownloader"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true">

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,7 @@
 <resources>
 
-    <style name="Theme.SpotifyPlaylistDownloader" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+    <style name="Theme.SpotifyPlaylistDownloader" parent="android:Theme.Material.NoActionBar">
+        <item name="android:colorPrimary">@color/md_theme_dark_primary</item>
         <item name="android:colorBackground">@color/md_theme_dark_background</item>
         <item name="android:statusBarColor" >@color/md_theme_dark_primary</item>
         <item name="android:navigationBarColor">@color/md_theme_dark_background</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -6,8 +6,8 @@
     <color name="md_theme_dark_primary">#FFB68A</color>
     <color name="md_theme_dark_background">#201A17</color>
 
-    <style name="Theme.SpotifyPlaylistDownloader" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="colorPrimary">@color/md_theme_light_primary</item>
+    <style name="Theme.SpotifyPlaylistDownloader" parent="android:Theme.Material.NoActionBar">
+        <item name="android:colorPrimary">@color/md_theme_light_primary</item>
         <item name="android:colorBackground">@color/md_theme_light_background</item>
         <item name="android:statusBarColor">@color/md_theme_light_primary</item>
         <item name="android:navigationBarColor">@color/md_theme_light_background</item>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "8.7.3" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
 }
diff --git a/gradle.properties b/gradle.properties
@@ -8,15 +8,16 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
+# Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.nonTransitiveRClass=true
-android.enableJetifier=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,8 +1,14 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {