diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 529e7b2b..8a4302ae 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,7 +25,6 @@ jobs: - run: | git submodule sync --recursive git submodule update --init --recursive - - run: ./gradlew androidDependencies - run: ./gradlew clean - run: ./gradlew PdCore:pd-core:build env: diff --git a/PdCore/build.gradle b/PdCore/build.gradle index 8cd944ff..7f0c7784 100644 --- a/PdCore/build.gradle +++ b/PdCore/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.0.1' } } @@ -23,7 +23,7 @@ allprojects { // These are specific to PdCore, but nexusPublishing needs them here: // https://github.com/gradle-nexus/publish-plugin/issues/84 group = 'io.github.libpd.android' -version = '1.4.1-SNAPSHOT' +version = '1.4.2-SNAPSHOT' // Create a Sonatype user token for these environment variables: // export ORG_GRADLE_PROJECT_sonatypeUsername="" diff --git a/PdCore/gradle.properties b/PdCore/gradle.properties index 2d8d1e4d..78ee1127 100644 --- a/PdCore/gradle.properties +++ b/PdCore/gradle.properties @@ -1 +1,14 @@ -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true + +# Bumping android gradle plugin from 8.13.2 to 9.0.1 breaks pd-core/build.gradle at 2 places: +# +# - android.libraryVariants cannot be resolved (used to rename the output aar). +# It should be replaced with androidComponents{onVariants} but I couldn't get it to work... +# +# - android.compileSdk cannot be resolved either (needed to locate the android.jar for building javadoc) +# I couldn't find a replacement. +# +# Using 'android.newDsl=false' is a temporary fix, until a solution is found for these 2 problems: + +android.newDsl=false + diff --git a/PdTest/build.gradle b/PdTest/build.gradle index 30323022..28dc4d5b 100644 --- a/PdTest/build.gradle +++ b/PdTest/build.gradle @@ -31,7 +31,7 @@ android { buildTypes { release { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/README.md b/README.md index 73f1bb98..3567973a 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ allprojects { ```gradle dependencies { - implementation 'io.github.libpd.android:pd-core:1.4.1-SNAPSHOT' + implementation 'io.github.libpd.android:pd-core:1.4.2-SNAPSHOT' } ``` diff --git a/build.gradle b/build.gradle index ddd6dcdb..e483fd3a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.0.1' } } @@ -20,5 +20,5 @@ ext { compileSdk = 34 androidxLegacySupportVersion = '1.0.0' ndkVersion = libs.versions.ndk.get() - pdCoreVersion = '1.4.1-SNAPSHOT' // Must match version in PdCore/build.gradle + pdCoreVersion = '1.4.2-SNAPSHOT' // Must match version in PdCore/build.gradle }