mirror of
https://github.com/AntennaPod/AntennaPod.git
synced 2026-08-18 02:53:10 +00:00
Upgrade to gradle plugin 9.0 (#8302)
### Description Upgrade to gradle plugin 9.0. This adds support for Java 25 ### Checklist <!-- To help us keep the issue tracker clean and work as efficient as possible, please make sure that you have done all of the following. You can tick the boxes below by placing an x inside the brackets like this: [x] --> - [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request - [x] I have performed a self-review of my code, going through my changes line by line and carefully considering why this line change is necessary - [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug` - [x] My code follows the style guidelines of the AntennaPod project: https://antennapod.org/contribute/develop/app/code-style - [x] I have mentioned the corresponding issue and the relevant keyword (e.g., "Closes: #xy") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) - [x] If it is a core feature, I have added automated tests
This commit is contained in:
committed by
GitHub
parent
07b74753fb
commit
c19b3d7223
@ -1,6 +1,5 @@
|
||||
plugins {
|
||||
alias(libs.plugins.android.application)
|
||||
alias(libs.plugins.kotlin.android)
|
||||
alias(libs.plugins.kotlin.compose)
|
||||
alias(libs.plugins.ktlint)
|
||||
}
|
||||
@ -9,6 +8,7 @@ apply from: "../playFlavor.gradle"
|
||||
|
||||
android {
|
||||
namespace "de.danoeh.antennapod.wearos"
|
||||
enableKotlin true
|
||||
|
||||
defaultConfig {
|
||||
applicationId "de.danoeh.antennapod"
|
||||
@ -45,10 +45,6 @@ android {
|
||||
compose true
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "21"
|
||||
}
|
||||
|
||||
lint {
|
||||
disable "UnusedResources"
|
||||
}
|
||||
|
||||
@ -133,6 +133,8 @@ dependencies {
|
||||
androidTestImplementation libs.androidx.test.runner
|
||||
androidTestImplementation libs.androidx.test.rules
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.hamcrest
|
||||
androidTestImplementation libs.hamcrest.library
|
||||
}
|
||||
|
||||
if (project.hasProperty("antennaPodPlayPublisherCredentials")) {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
android {
|
||||
compileSdk 36
|
||||
enableKotlin false
|
||||
|
||||
defaultConfig {
|
||||
minSdk 23
|
||||
@ -18,7 +19,7 @@ android {
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard.cfg"
|
||||
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard.cfg"
|
||||
resValue "string", "app_name", "AntennaPod"
|
||||
}
|
||||
debug {
|
||||
@ -65,6 +66,7 @@ android {
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
buildConfig true
|
||||
resValues true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
android.useAndroidX=true
|
||||
org.gradle.jvmargs=-Xmx4096m
|
||||
android.newDsl=false
|
||||
android.onlyEnableUnitTestForTheTestedBuildType=false
|
||||
android.nonTransitiveRClass=false
|
||||
org.gradle.jvmargs=-Xmx4096m
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "8.11.0"
|
||||
agp = "9.0.1"
|
||||
kotlin = "2.3.20"
|
||||
media3 = "1.9.0"
|
||||
wear-compose = "1.6.0"
|
||||
@ -76,13 +76,15 @@ nanohttpd = { module = "com.nanohttpd:nanohttpd", version = "2.1.1" }
|
||||
awaitility = { module = "org.awaitility:awaitility", version = "3.1.6" }
|
||||
junit = { module = "junit:junit", version = "4.13" }
|
||||
robolectric = { module = "org.robolectric:robolectric", version = "4.16" }
|
||||
mockito-core = { module = "org.mockito:mockito-core", version = "5.15.2" }
|
||||
mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
|
||||
hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
|
||||
hamcrest-library = { module = "org.hamcrest:hamcrest-library", version = "2.2" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
android-library = { id = "com.android.library", version.ref = "agp" }
|
||||
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
|
||||
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||
spotbugs = { id = "com.github.spotbugs", version = "4.8.0" }
|
||||
spotbugs = { id = "com.github.spotbugs", version = "6.4.8" }
|
||||
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.3.0" }
|
||||
triplet-play = { id = "com.github.triplet.play", version = "3.9.0" }
|
||||
triplet-play = { id = "com.github.triplet.play", version = "4.0.0" }
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,7 +1,6 @@
|
||||
#Sun Aug 17 17:07:23 CEST 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
8
gradlew
vendored
8
gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/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/.
|
||||
@ -84,7 +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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@ -203,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.
|
||||
|
||||
2
gradlew.bat
vendored
2
gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
plugins {
|
||||
alias(libs.plugins.android.library)
|
||||
id("java-test-fixtures")
|
||||
}
|
||||
apply from: "../../../common.gradle"
|
||||
apply from: "../../../playFlavor.gradle"
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
plugins {
|
||||
alias(libs.plugins.android.library)
|
||||
id("java-test-fixtures")
|
||||
}
|
||||
apply from: "../../../common.gradle"
|
||||
apply from: "../../../playFlavor.gradle"
|
||||
|
||||
Reference in New Issue
Block a user