Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions PdCore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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="<tokenUsername>"
Expand Down
15 changes: 14 additions & 1 deletion PdCore/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
android.useAndroidX=true
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

2 changes: 1 addition & 1 deletion PdTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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
}