Update Gradle to 8.2 and AGP to 8.2.2

AndEngine/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    namespace 'org.anddev.andengine'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
     }
 
     sourceSets {
@@ -18,16 +18,18 @@ android {
     }
 
     useLibrary 'org.apache.http.legacy'
-
-    lintOptions {
+    lint {
         abortOnError true
         ignoreWarnings true
-        disable 'ExpiredTargetSdkVersion'
     }
+    buildFeatures {
+        buildConfig true
+    }
+
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.11.0'
 }

LibBASS/build.gradle

@@ -1,28 +1,27 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     ndkVersion '22.1.7171670'
 
     defaultConfig {
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError true
-        ignoreWarnings true
-        disable 'ExpiredTargetSdkVersion'
-    }
 
     buildTypes {
         release {
             minifyEnabled false
 //            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.un4seen.bass'
+    lint {
+        abortOnError true
+        ignoreWarnings true
+    }
 
 }
 

LibBASS/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.un4seen.bass" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

andnext_markdown/build.gradle

@@ -1,32 +1,35 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError true
-        ignoreWarnings true
-        disable 'MissingTranslation', 'ExpiredTargetSdkVersion', 'ProtectedPermissions', 'AppLinkUrlError'
-    }
 
     buildTypes {
         release {
             minifyEnabled false
 //            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'club.andnext.markdown'
+    lint {
+        abortOnError true
+//        disable 'MissingTranslation', 'ExpiredTargetSdkVersion', 'ProtectedPermissions', 'AppLinkUrlError'
+        ignoreWarnings true
+    }
+    buildFeatures {
+        buildConfig true
+    }
 
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }

andnext_markdown/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="club.andnext.markdown" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

build.gradle

@@ -1,16 +1,16 @@
 buildscript {
     ext{
-        kotlin_version = '1.7.0'
+        kotlin_version = '1.9.22'
     }
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -46,10 +46,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    namespace 'ru.nsu.ccfit.zuev.osuplus'
+    compileSdk 34
     ndkVersion '22.1.7171670'
 
     defaultConfig {
@@ -61,11 +61,13 @@ android {
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
     }
-
     packagingOptions {
-        exclude 'META-INF/proguard/coroutines.pro'
+        resources {
+            excludes += ['META-INF/proguard/coroutines.pro']
+        }
     }
 
+
     signingConfigs {
         debug {
             storeFile file('debug.jks')
@@ -97,7 +99,6 @@ android {
 
         release {
             resValue "string", "app_name", "osu!droid"
-            zipAlignEnabled true
 //            minifyEnabled true
 //            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.cfg', 'proguard-kotlin.pro'
             signingConfig signingConfigs.release
@@ -109,7 +110,6 @@ android {
         pre_release {
             matchingFallbacks = ['release']
             resValue "string", "app_name", "osu!droid"
-            zipAlignEnabled true
 //            minifyEnabled true
 //            debuggable true
 //            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.cfg', 'proguard-kotlin.pro'
@@ -132,17 +132,20 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     useLibrary 'org.apache.http.legacy'
-
-    lintOptions {
+    lint {
         abortOnError true
-        ignoreWarnings true
         disable 'MissingTranslation', 'ExpiredTargetSdkVersion', 'ProtectedPermissions', 'AppLinkUrlError'
+        ignoreWarnings true
     }
+    buildFeatures {
+        buildConfig true
+    }
+
 
     android.applicationVariants.all { variant ->
         variant.outputs.all { output ->
@@ -157,32 +160,32 @@ dependencies {
     implementation project(':AndEngine')
     implementation project(':andnext_markdown')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.1'
-    implementation 'com.google.firebase:firebase-analytics:19.0.1'
-    implementation 'com.google.firebase:firebase-messaging:22.0.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.6.2'
+    implementation 'com.google.firebase:firebase-analytics:21.5.1'
+    implementation 'com.google.firebase:firebase-messaging:23.4.1'
 
     // implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     // implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.10.1'
     //implementation 'com.github.tbruyelle:rxpermissions:0.12'
     implementation 'pub.devrel:easypermissions:3.0.0'
-    implementation 'net.lingala.zip4j:zip4j:2.9.0'
+    implementation 'net.lingala.zip4j:zip4j:2.11.5'
 
     implementation 'com.github.EdrowsLuo:osudroidstrings:bd9507b289'
     implementation 'com.github.EdrowsLuo.EdlGameFramework:EdlJavaExt:d91c53fcff'
     implementation 'com.github.EdrowsLuo.EdlGameFramework:EdlOsbSupport:d91c53fcff'
     implementation project(path: ':LibBASS')
 
-    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.15.1'
     implementation 'com.github.delight-im:Android-AdvancedWebView:v3.2.1'
 
     // Multiplayer
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3')
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
     implementation ('io.socket:socket.io-client:2.1.0') {
         exclude group: 'org.json', module: 'json'
     }

gradle.properties

@@ -14,6 +14,8 @@
 # org.gradle.parallel=true
 #Thu Oct 06 22:58:27 CST 2016
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=true
 android.useAndroidX=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx2048m

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip

src/com/edlplan/framework/support/batch/AbstractBatch.java

@@ -23,12 +23,6 @@ public abstract class AbstractBatch<T> {
 
     protected abstract boolean applyToGL();
 
-    public void addAll(T... ts) {
-        for (T t : ts) {
-            add(t);
-        }
-    }
-
     protected void checkForBind() {
         if (!isBind()) {
             bind();

src/com/edlplan/osu/support/timing/TimingPoint.java

@@ -42,7 +42,7 @@ public double getBeatLength() {
         return beatLength;
     }
 
-    public strictfp void setBeatLength(double beatLength) {
+    public void setBeatLength(double beatLength) {
         this.beatLength = beatLength;
         speedMultiplier = (beatLength < 0 ? (100.0 / -beatLength) : 1);
     }

src/com/edlplan/ui/InputDialog.java

@@ -10,7 +10,7 @@
 public class InputDialog extends Dialog {
 
     public InputDialog(@NonNull Context context) {
-        super(context, R.style.Theme_Design_BottomSheetDialog);
+        super(context, com.google.android.material.R.style.Theme_Design_BottomSheetDialog);
         setContentView(R.layout.dialog_for_input);
     }
 

src/com/edlplan/ui/fragment/FilterMenuFragment.kt

@@ -65,9 +65,9 @@ class FilterMenuFragment : BaseFragment(), IUpdateHandler, IFilterMenu {
 
     override fun getOrder(): SongMenu.SortOrder {
         val prefs =
-            PreferenceManager.getDefaultSharedPreferences(configContext)
+            PreferenceManager.getDefaultSharedPreferences(configContext!!)
         val order = prefs.getInt("sortorder", 0)
-        return SongMenu.SortOrder.values()[order % SongMenu.SortOrder.values().size]
+        return SongMenu.SortOrder.entries[order % SongMenu.SortOrder.entries.size]
     }
 
     override fun isFavoritesOnly(): Boolean = favoritesOnly.isChecked
@@ -253,13 +253,13 @@ class FilterMenuFragment : BaseFragment(), IUpdateHandler, IFilterMenu {
 
     private fun nextOrder() {
         var order = order
-        order = SongMenu.SortOrder.values()[(order.ordinal + 1) % SongMenu.SortOrder.values().size]
+        order = SongMenu.SortOrder.entries.toTypedArray()[(order.ordinal + 1) % SongMenu.SortOrder.entries.size]
         saveOrder(order)
     }
 
     private fun saveOrder(order: SongMenu.SortOrder) {
         PreferenceManager
-            .getDefaultSharedPreferences(configContext)
+            .getDefaultSharedPreferences(configContext!!)
             .edit()
             .putInt("sortorder", order.ordinal)
             .commit()

src/com/edlplan/ui/fragment/InGameSettingMenu.kt

@@ -204,7 +204,7 @@ class InGameSettingMenu : BaseFragment() {
         }
 
         val backgroundBrightness = findViewById<SeekBar>(R.id.backgroundBrightnessBar)!!
-        backgroundBrightness.progress = PreferenceManager.getDefaultSharedPreferences(context)
+        backgroundBrightness.progress = PreferenceManager.getDefaultSharedPreferences(requireContext())
             .getInt("bgbrightness", 25)
         backgroundBrightness.setOnSeekBarChangeListener(
             object : OnSeekBarChangeListener {
@@ -239,14 +239,14 @@ class InGameSettingMenu : BaseFragment() {
                     val progress = seekBar!!.progress
                     findViewById<TextView>(R.id.bgBrightnessText)!!.text = "$progress%"
                     Config.setBackgroundBrightness(seekBar.progress / 100f)
-                    PreferenceManager.getDefaultSharedPreferences(context).edit()
+                    PreferenceManager.getDefaultSharedPreferences(context!!).edit()
                         .putInt("bgbrightness", progress).commit()
                 }
             }
         )
 
         findViewById<TextView>(R.id.bgBrightnessText)!!.text = "${
-            PreferenceManager.getDefaultSharedPreferences(context).getInt("bgbrightness", 25)
+            PreferenceManager.getDefaultSharedPreferences(requireContext()).getInt("bgbrightness", 25)
         }%"
 
         speedModifyBar = findViewById(R.id.changeSpeedBar)!!
@@ -533,7 +533,7 @@ class InGameSettingMenu : BaseFragment() {
             ?.setInterpolator(EasingHelper.asInterpolator(Easing.InOutQuad))
             ?.setListener(
                 object : BaseAnimationListener() {
-                    override fun onAnimationEnd(animation: Animator?) {
+                    override fun onAnimationEnd(animation: Animator) {
                         super.onAnimationEnd(animation)
                         val background = findViewById<RelativeLayout>(R.id.frg_background)!!
                         background.isClickable = true
@@ -555,7 +555,7 @@ class InGameSettingMenu : BaseFragment() {
             ?.setInterpolator(EasingHelper.asInterpolator(Easing.InOutQuad))
             ?.setListener(
                 object : BaseAnimationListener() {
-                    override fun onAnimationEnd(animation: Animator?) {
+                    override fun onAnimationEnd(animation: Animator) {
                         super.onAnimationEnd(animation)
                         findViewById<RelativeLayout>(R.id.frg_background)!!.isClickable = false
                     }