Update dependencies

cuberite · Jan 31, 2024 · 1c0511b · 1c0511b
1 parent 3a0517a
commit 1c0511b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
         applicationId "org.cuberite.android"
-        resConfigs 'en', 'de', 'nl', 'pt', 'zh_CN'
-        minSdkVersion 16
+        resourceConfigurations += ['en', 'de', 'nl', 'pt', 'zh_CN']
+        minSdk 16
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 28
+        targetSdk 28
         versionCode 12
         versionName "1.6.0"
         vectorDrawables.useSupportLibrary = true
@@ -30,14 +30,14 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core:1.9.0'
-    implementation 'androidx.fragment:fragment:1.5.6'
+    implementation 'androidx.core:core:1.12.0'
+    implementation 'androidx.fragment:fragment:1.6.2'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
-    implementation('androidx.preference:preference:1.2.0') {
+    implementation('androidx.preference:preference:1.2.1') {
         exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel'
         exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
     }
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'com.google.android.material:material:1.9.0-beta01'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'org.ini4j:ini4j:0.5.4'
 }
diff --git a/app/src/main/java/org/cuberite/android/services/CuberiteService.java b/app/src/main/java/org/cuberite/android/services/CuberiteService.java
@@ -1,7 +1,6 @@
 package org.cuberite.android.services;
 
 import android.app.IntentService;
-import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -30,8 +30,8 @@
         <item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
         <item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
 
-        <item name="android:statusBarColor" tools:targetApi="m">@color/android:transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@color/android:transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
 
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -30,8 +30,8 @@
         <item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
         <item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
 
-        <item name="android:statusBarColor" tools:targetApi="m">@color/android:transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@color/android:transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
 
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
@@ -4,5 +4,6 @@
     <locale android:name="de"/>
     <locale android:name="nl"/>
     <locale android:name="pt"/>
+    <locale android:name="zh"/>
     <locale android:name="zh_CN"/>
 </locale-config>
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,6 +27,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
 android.injected.testOnly=false
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists