Merge synonym plugin to downloader

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -6,19 +8,19 @@ plugins {
 }
 
 dependencies {
-    compileOnly(libs.plugin.api)
+    compileOnly(libs.downloader.api)
 }
 
 android {
-    val packageName = "app.revanced.manager.plugin.downloader.apkmirror"
+    val packageName = "app.revanced.manager.downloader"
 
     namespace = packageName
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = packageName
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionName = version.toString()
         versionCode = versionName!!.filter { it.isDigit() }.toInt()
     }
@@ -49,11 +51,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-
+    
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     applicationVariants.all {
         outputs.all {
             this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
@@ -63,6 +61,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 tasks {
     val assembleReleaseSignApk by registering {
         dependsOn("assembleRelease")

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-plugin-api = "1.0.0"
+downloader-api = "1.0.0"
-android-gradle-plugin = "8.7.3"
+android-gradle-plugin = "8.11.0"
-kotlin = "2.1.0"
+kotlin = "2.3.0"
 
 [libraries]
-plugin-api = { group = "app.revanced", name = "revanced-manager-downloader-api", version.ref = "plugin-api" }
+downloader-api = { group = "app.revanced", name = "revanced-manager-downloader-api", version.ref = "downloader-api" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -1,4 +1,4 @@
-rootProject.name = "revanced-manager-apkmirror-downloader"
+rootProject.name = "revanced-manager-downloader"
 
 pluginManagement.repositories {
     gradlePluginPortal()

src/main/AndroidManifest.xml

@@ -2,15 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature android:name="app.revanced.manager.plugin.downloader" />
+    <uses-feature android:name="app.revanced.manager.downloader" />
 
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         tools:targetApi="35">
-
         <meta-data
-            android:name="app.revanced.manager.plugin.downloader.class"
+            android:name="app.revanced.manager.downloader.classes"
-            android:value="app.revanced.manager.plugin.downloader.apkmirror.APKMirrorDownloaderKt" />
+            android:resource="@array/app.revanced.manager.downloader.classes"/>
     </application>
 </manifest>

src/main/kotlin/app/revanced/manager/downloader/apkmirror/APKMirrorDownloader.kt

@@ -1,6 +1,6 @@
 @file:Suppress("Unused")
 
-package app.revanced.manager.plugin.downloader.apkmirror
+package app.revanced.manager.downloader.apkmirror
 
 import android.net.Uri
 import app.revanced.manager.plugin.downloader.webview.WebViewDownloader
@@ -20,4 +20,4 @@ val apkMirrorDownloader = WebViewDownloader { packageName, version ->
 
         build().toString()
     }
-}
+}

src/main/res/values/arrays.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="app.revanced.manager.downloader.classes">
+        <item>app.revanced.manager.downloader.apkmirror.APKMirrorDownloaderKt</item>
+    </string-array>
+</resources>

src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">ReVanced Manager: APKMirror downloader</string>
+    <string name="app_name">ReVanced Manager downloader</string>
 </resources>