build: bump gradle version from 8.7.2 to 9.2.1

Signed-off-by: Jorge Aguado Recio <jaguado@izertis.com>

Author: joragua

gradle.properties

@@ -1,6 +1,4 @@
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
-android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M

gradle/libs.versions.toml

@@ -15,8 +15,8 @@ androidxFragment = "1.5.7"
 androidxLegacy = "1.0.0"
 androidxLifecycle = "2.5.1"
 androidxLifecycleExtensions = "2.2.0"
-androidxRoom = "2.5.1"
-androidxSqlite = "2.3.1"
+androidxRoom = "2.8.4"
+androidxSqlite = "2.5.2"
 androidxTest = "1.4.0"
 androidxTestExt = "1.1.5"
 androidxTestMonitor = "1.6.1"
@@ -33,9 +33,9 @@ glide = "4.15.1"
 glideToVectorYou = "v2.0.0"
 junit4 = "4.13.2"
 koin = "3.3.3"
-kotlin = "1.9.20"
+kotlin = "2.3.10"
 kotlinxCoroutines = "1.9.0"
-ksp = "1.9.20-1.0.14"
+ksp = "2.3.10"
 ktlint = "14.2.0"
 markwon = "4.6.2"
 material = "1.8.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

owncloudApp/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.devtools.ksp'
-apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 def commitSHA1 = 'COMMIT_SHA1'
@@ -93,11 +92,11 @@ dependencies {
 }
 
 android {
-    compileSdkVersion sdkCompileVersion
+    compileSdk sdkCompileVersion
 
     defaultConfig {
-        minSdkVersion sdkMinVersion
-        targetSdkVersion sdkTargetVersion
+        minSdk sdkMinVersion
+        targetSdk sdkTargetVersion
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
@@ -113,10 +112,6 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     sourceSets {
         androidTest.java.srcDirs += "src/test-common/java"
         test.java.srcDirs += "src/test-common/java"
@@ -166,11 +161,6 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
-        def appName = System.env.OC_APP_NAME
-        setOutputFileName(variant, appName, project)
-    }
-
     testOptions {
         packagingOptions {
             jniLibs {
@@ -183,61 +173,36 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
-    packagingOptions {
+    packaging {
         resources.excludes.add("META-INF/*")
     }
 
     namespace "com.owncloud.android"
     testNamespace "com.owncloud.android.test"
 }
 
-// Updates output file names of a given variant to format
-// [appName].[variant.versionName].[OC_BUILD_NUMBER]-[variant.name].apk.
-//
-// OC_BUILD_NUMBER is an environment variable read directly in this method. If undefined, it's not added.
-//
-// @param variant           Build variant instance which output file name will be updated.
-// @param appName           String to use as first part of the new file name. May be undefined, the original
-//                          project.archivesBaseName property will be used instead.
-// @param callerProject     Caller project.
-
-def setOutputFileName(variant, appName, callerProject) {
-    logger.info("Setting new name for output of variant $variant.name")
-
-    def originalFile = variant.outputs[0].outputFile
-    def originalName = originalFile.name
-    println "originalName is $originalName"
-
-    def newName = ""
-
-    if (appName) {
-        newName += appName
-    } else {
-        newName += "owncloud"
-    }
-
-    def versionName = "$variant.mergedFlavor.versionName"
-    if (variant.mergedFlavor.manifestPlaceholders.versionName != null) {
-        versionName = "$variant.mergedFlavor.manifestPlaceholders.versionName"
-    }
-    if (variant.buildType.manifestPlaceholders.versionName != null) {
-        versionName = "$variant.buildType.manifestPlaceholders.versionName"
-    }
-    newName += "_$versionName"
-
-    def buildNumber = System.env.OC_BUILD_NUMBER
-    if (buildNumber) {
-        newName += "_$buildNumber"
-    }
-
-    newName += originalName.substring(callerProject.archivesBaseName.length())
-
-    println "$variant.name: newName is $newName"
-
-    variant.outputs.all {
-        outputFileName = newName
+// Updates output APK file names to the format [appName]_[versionName]_[OC_BUILD_NUMBER]-[variantName].apk
+// using the new AGP Variant API (androidComponents), as the legacy applicationVariants API was removed in AGP 9.
+// OC_APP_NAME and OC_BUILD_NUMBER are read from the environment; when undefined they fall back / are omitted.
+androidComponents {
+    onVariants(selector().all()) { variant ->
+        def appName = System.env.OC_APP_NAME ?: "owncloud"
+        def buildNumber = System.env.OC_BUILD_NUMBER
+        variant.outputs.each { output ->
+            if (output.outputType == com.android.build.api.variant.VariantOutputConfiguration.OutputType.SINGLE) {
+                output.outputFileName.set(output.versionName.map { versionName ->
+                    def newName = appName + "_" + versionName
+                    if (buildNumber) {
+                        newName += "_" + buildNumber
+                    }
+                    newName += "-" + variant.name + ".apk"
+                    newName
+                })
+            }
+        }
     }
 }
 

owncloudApp/src/main/java/com/owncloud/android/media/MediaControlView.java

@@ -292,32 +292,26 @@ public void setEnabled(boolean enabled) {
     public void onClick(View v) {
         int pos;
         boolean playing = mPlayer.isPlaying();
-        switch (v.getId()) {
-
-            case R.id.playBtn:
-                doPauseResume();
-                break;
-
-            case R.id.rewindBtn:
-                pos = mPlayer.getCurrentPosition();
-                pos -= 5000;
-                mPlayer.seekTo(pos);
-                if (!playing) {
-                    mPlayer.pause();  // necessary in some 2.3.x devices
-                }
-                setProgress();
-                break;
-
-            case R.id.forwardBtn:
-                pos = mPlayer.getCurrentPosition();
-                pos += 15000;
-                mPlayer.seekTo(pos);
-                if (!playing) {
-                    mPlayer.pause(); // necessary in some 2.3.x devices
-                }
-                setProgress();
-                break;
-
+        int id = v.getId();
+
+        if (id == R.id.playBtn) {
+            doPauseResume();
+        } else if (id == R.id.rewindBtn) {
+            pos = mPlayer.getCurrentPosition();
+            pos -= 5000;
+            mPlayer.seekTo(pos);
+            if (!playing) {
+                mPlayer.pause();  // necessary in some 2.3.x devices
+            }
+            setProgress();
+        } else if (id == R.id.forwardBtn) {
+            pos = mPlayer.getCurrentPosition();
+            pos += 15000;
+            mPlayer.seekTo(pos);
+            if (!playing) {
+                mPlayer.pause(); // necessary in some 2.3.x devices
+            }
+            setProgress();
         }
     }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/shares/PublicShareDialogFragment.kt

@@ -50,6 +50,7 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.SharePublicDialogBinding
 import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType
 import com.owncloud.android.domain.capabilities.model.OCCapability
+import com.owncloud.android.domain.capabilities.model.PasswordPolicy
 import com.owncloud.android.domain.exceptions.UnhandledHttpCodeException
 import com.owncloud.android.domain.files.model.OCFile
 import com.owncloud.android.domain.sharing.shares.model.OCShare
@@ -364,7 +365,7 @@ class PublicShareDialogFragment : DialogFragment() {
         }
     }
 
-    private fun updateRequirementsPasswordPolicy(password: String, passwordPolicy: OCCapability.PasswordPolicy) {
+    private fun updateRequirementsPasswordPolicy(password: String, passwordPolicy: PasswordPolicy) {
 
         var hasMinCharacters = true
         var hasMaxCharacters = true

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/links/SetPasswordDialogFragment.kt

@@ -37,7 +37,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.DialogFragment
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SetPasswordDialogBinding
-import com.owncloud.android.domain.capabilities.model.OCCapability
+import com.owncloud.android.domain.capabilities.model.PasswordPolicy
 import com.owncloud.android.presentation.capabilities.CapabilityViewModel
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.presentation.sharing.generatePassword
@@ -57,7 +57,7 @@ class SetPasswordDialogFragment: DialogFragment() {
 
     private lateinit var setPasswordListener: SetPasswordListener
 
-    private var passwordPolicy: OCCapability.PasswordPolicy? = null
+    private var passwordPolicy: PasswordPolicy? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         _binding = SetPasswordDialogBinding.inflate(inflater, container, false)
@@ -134,7 +134,7 @@ class SetPasswordDialogFragment: DialogFragment() {
         setPasswordListener.onCancelPassword()
     }
 
-    private fun updatePasswordPolicyRequirements(password: String, passwordPolicy: OCCapability.PasswordPolicy) {
+    private fun updatePasswordPolicyRequirements(password: String, passwordPolicy: PasswordPolicy) {
         var hasMinCharacters = true
         var hasMaxCharacters = true
         var hasUpperCase = true

owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -506,23 +506,20 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     @Override
     public void onClick(View v) {
         // click on button
-        switch (v.getId()) {
-            case R.id.uploader_choose_folder:
-                mUploadPath = "";   // first element in mParents is root dir, represented by "";
-                // init mUploadPath with "/" results in a "//" prefix
-                for (String p : mParents) {
-                    mUploadPath += p + File.separator;
-                }
-                if (!isPlainTextUpload()) {
-                    Timber.d("Uploading file to dir %s", mUploadPath);
-                    uploadFiles();
-                } else {
-                    showUploadTextDialog();
-                }
-                break;
-
-            default:
-                throw new IllegalArgumentException("Wrong element clicked");
+        if (v.getId() == R.id.uploader_choose_folder) {
+            mUploadPath = "";   // first element in mParents is root dir, represented by "";
+            // init mUploadPath with "/" results in a "//" prefix
+            for (String p : mParents) {
+                mUploadPath += p + File.separator;
+            }
+            if (!isPlainTextUpload()) {
+                Timber.d("Uploading file to dir %s", mUploadPath);
+                uploadFiles();
+            } else {
+                showUploadTextDialog();
+            }
+        } else {
+            throw new IllegalArgumentException("Wrong element clicked");
         }
     }
 

owncloudComLibrary/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'kotlin-parcelize'
 
@@ -33,22 +32,18 @@ dependencies {
 }
 
 android {
-    compileSdkVersion sdkCompileVersion
+    compileSdk sdkCompileVersion
 
     defaultConfig {
-        minSdkVersion sdkMinVersion
-        targetSdkVersion sdkTargetVersion
+        minSdk sdkMinVersion
+        targetSdk sdkTargetVersion
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     lint {
         abortOnError false
         ignoreWarnings true

owncloudData/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.google.devtools.ksp'
-apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion sdkCompileVersion
+    compileSdk sdkCompileVersion
 
     defaultConfig {
-        minSdkVersion sdkMinVersion
-        targetSdkVersion sdkTargetVersion
+        minSdk sdkMinVersion
+        targetSdk sdkTargetVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -31,18 +30,14 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     sourceSets {
         androidTest.java.srcDirs += "src/test-common/java"
         test.java.srcDirs += "src/test-common/java"
         // Room Database Tests
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
-    packagingOptions {
+    packaging {
         resources.excludes.add("META-INF/*")
     }