mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 15:50:16 +02:00
Update AGP, Gradle, & other third party dependencies (#1356)
## Description Just a lot of dependency bumps. There are no user facing changes. Switches to the new Android gradle DSL now that the protobuf plugin is compatible. ### Related issues None ### Testing Emulator ## Screenshots N/A ## AI or LLM usage None
This commit is contained in:
Damontecres
GitHub
parent
8107a82a6b
commit
45ab0713a9
7 changed files with 56 additions and 56 deletions
|
|
@ -1,4 +1,6 @@
|
|||
import com.android.build.api.dsl.ApplicationExtension
|
||||
import com.android.build.api.dsl.ProductFlavor
|
||||
import com.android.build.api.variant.FilterConfiguration
|
||||
import com.google.protobuf.gradle.id
|
||||
import com.mikepenz.aboutlibraries.plugin.DuplicateMode
|
||||
import com.mikepenz.aboutlibraries.plugin.DuplicateRule
|
||||
|
|
@ -37,7 +39,15 @@ val gitDescribe =
|
|||
.standardOutput.asText
|
||||
.getOrElse("v0.0.0")
|
||||
|
||||
android {
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3
|
||||
jvmTarget = JvmTarget.JVM_11
|
||||
javaParameters = true
|
||||
}
|
||||
}
|
||||
|
||||
configure<ApplicationExtension> {
|
||||
namespace = "com.github.damontecres.wholphin"
|
||||
compileSdk = 36
|
||||
|
||||
|
|
@ -98,18 +108,6 @@ android {
|
|||
isDebuggable = true
|
||||
applicationIdSuffix = ".debug"
|
||||
}
|
||||
|
||||
applicationVariants.all {
|
||||
val variant = this
|
||||
variant.outputs
|
||||
.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
|
||||
.forEach { output ->
|
||||
val abi = output.getFilter("ABI").let { if (it != null) "-$it" else "" }
|
||||
val outputFileName =
|
||||
"Wholphin-${variant.baseName}-${variant.versionName}-${variant.versionCode}$abi.apk"
|
||||
output.outputFileName = outputFileName
|
||||
}
|
||||
}
|
||||
}
|
||||
flavorDimensions += "version"
|
||||
productFlavors {
|
||||
|
|
@ -148,20 +146,11 @@ android {
|
|||
targetCompatibility = JavaVersion.VERSION_11
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
}
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3
|
||||
jvmTarget = JvmTarget.JVM_11
|
||||
javaParameters = true
|
||||
}
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
buildConfig = true
|
||||
compose = true
|
||||
}
|
||||
room {
|
||||
schemaDirectory("$projectDir/schemas")
|
||||
}
|
||||
|
||||
splits {
|
||||
abi {
|
||||
|
|
@ -195,6 +184,26 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
androidComponents {
|
||||
onVariants(selector().all()) { variant ->
|
||||
variant.outputs
|
||||
.map { it as com.android.build.api.variant.impl.VariantOutputImpl }
|
||||
.forEach { output ->
|
||||
val abi =
|
||||
output
|
||||
.getFilter(FilterConfiguration.FilterType.ABI)
|
||||
.let { if (it != null) "-${it.identifier}" else "" }
|
||||
val outputFileName =
|
||||
"Wholphin-${variant.flavorName}-${variant.buildType}-${output.versionName.get()}-${output.versionCode.get()}$abi.apk"
|
||||
output.outputFileName = outputFileName
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
room {
|
||||
schemaDirectory("$projectDir/schemas")
|
||||
}
|
||||
|
||||
protobuf {
|
||||
protoc {
|
||||
artifact = "com.google.protobuf:protoc:${libs.protobuf.kotlin.lite.get().version}"
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@ android.dependency.useConstraints=false
|
|||
android.r8.strictFullModeForKeepRules=true
|
||||
android.r8.optimizedResourceShrinking=true
|
||||
android.builtInKotlin=true
|
||||
android.newDsl=false
|
||||
android.newDsl=true
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
[versions]
|
||||
aboutLibraries = "14.0.1"
|
||||
aboutLibraries = "14.1.0"
|
||||
acra = "5.13.1"
|
||||
agp = "9.0.1"
|
||||
agp = "9.1.1"
|
||||
auto-service = "1.1.1"
|
||||
autoServiceKsp = "1.2.0"
|
||||
desugar_jdk_libs = "2.1.5"
|
||||
hiltNavigationCompose = "1.3.0"
|
||||
hiltWork = "1.3.0"
|
||||
kache = "2.1.1"
|
||||
kotlin = "2.3.20"
|
||||
kotlin = "2.3.21"
|
||||
ksp = "2.3.7"
|
||||
coreKtx = "1.18.0"
|
||||
appcompat = "1.7.1"
|
||||
composeBom = "2026.04.01"
|
||||
composeBom = "2026.05.00"
|
||||
mockk = "1.14.9"
|
||||
robolectric = "4.16.1"
|
||||
multiplatformMarkdownRenderer = "0.40.2"
|
||||
|
|
@ -20,8 +20,8 @@ okhttpBom = "5.3.2"
|
|||
programguide = "1.6.0"
|
||||
slf4j2Timber = "1.2"
|
||||
timber = "5.0.1"
|
||||
tvFoundation = "1.0.0-rc01"
|
||||
tvMaterial = "1.0.1"
|
||||
tvFoundation = "1.0.0"
|
||||
tvMaterial = "1.1.0"
|
||||
lifecycleRuntimeKtx = "2.10.0"
|
||||
activityCompose = "1.13.0"
|
||||
androidx-media3 = "1.10.0"
|
||||
|
|
@ -30,7 +30,7 @@ jellyfin-sdk = "1.7.1"
|
|||
nav3Core = "1.1.1"
|
||||
lifecycleViewmodelNav3 = "2.10.0"
|
||||
material3AdaptiveNav3 = "1.0.0-alpha03"
|
||||
protobuf = "0.9.6"
|
||||
protobuf = "0.10.0"
|
||||
datastore = "1.2.1"
|
||||
kotlinx-serialization = "1.11.0"
|
||||
protobuf-javalite = "4.34.1"
|
||||
|
|
@ -43,9 +43,9 @@ paletteKtx = "1.0.0"
|
|||
assMedia = "0.4.0"
|
||||
kotlinxCoroutinesTest = "1.10.2"
|
||||
coreTesting = "2.2.0"
|
||||
openapi-generator = "7.21.0"
|
||||
openapi-generator = "7.22.0"
|
||||
runner = "1.7.0"
|
||||
wholphin-extensions = "0.1.1"
|
||||
wholphin-extensions = "0.1.2"
|
||||
|
||||
[libraries]
|
||||
wholphin-extensions-mpv = { module = "com.github.damontecres.wholphin.mpv:wholphin-mpv", version.ref = "wholphin-extensions" }
|
||||
|
|
|
|||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,7 +1,9 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
|
||||
networkTimeout=10000
|
||||
retries=0
|
||||
retryBackOffMs=500
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
2
gradlew
vendored
2
gradlew
vendored
|
|
@ -57,7 +57,7 @@
|
|||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
|
|
|
|||
31
gradlew.bat
vendored
31
gradlew.bat
vendored
|
|
@ -23,8 +23,8 @@
|
|||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
||||
setlocal EnableExtensions
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
|
|
@ -51,7 +51,7 @@ echo. 1>&2
|
|||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
|
|
@ -65,7 +65,7 @@ echo. 1>&2
|
|||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
|
@ -73,21 +73,10 @@ goto fail
|
|||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
||||
@rem which allows us to clear the local environment before executing the java command
|
||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
:exitWithErrorLevel
|
||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue