Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TECHNICAL] Update Android Gradle Plugin version #4507

Merged
merged 5 commits into from
Nov 6, 2024
Merged

[TECHNICAL] Update Android Gradle Plugin version #4507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c4ad6a
build: upgraded Java version to 17 in Java and Kotlin options in buil…
JuancaG05 Nov 4, 2024
c59eda5
build: upgraded AGP version to 8.7.2 and Gradle version to 8.9
JuancaG05 Nov 4, 2024
c88506b
chore: added calens file
JuancaG05 Nov 4, 2024
488bf91
docs: calens changelog updated
JuancaG05 Nov 4, 2024
686ca27
fix: added mutability flag to PendingIntents for lint to pass
JuancaG05 Nov 6, 2024
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ownCloud admins and users.

* Change - Replace auto-uploads with automatic uploads: [#4252](https://github.com/owncloud/android/issues/4252)
* Enhancement - Add status message when (un)setting av. offline from preview: [#4382](https://github.com/owncloud/android/issues/4382)
* Enhancement - Upgraded AGP version to 8.7.2: [#4478](https://github.com/owncloud/android/issues/4478)
* Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)

## Details
Expand All @@ -57,6 +58,14 @@ ownCloud admins and users.
https://github.com/owncloud/android/issues/4382
https://github.com/owncloud/android/pull/4482

* Enhancement - Upgraded AGP version to 8.7.2: [#4478](https://github.com/owncloud/android/issues/4478)

The Android Gradle Plugin version has been upgraded to 8.7.2, together with
Gradle version (updated to 8.9) and JDK version (updated to JBR 17).

https://github.com/owncloud/android/issues/4478
https://github.com/owncloud/android/pull/4507

* Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)

Text labels have been added below the icons, and the active indicator feature is
Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/4507
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Upgraded AGP version to 8.7.2

The Android Gradle Plugin version has been upgraded to 8.7.2, together with Gradle version (updated to 8.9) and
JDK version (updated to JBR 17).

https://github.com/owncloud/android/issues/4478
https://github.com/owncloud/android/pull/4507
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
androidGradlePlugin = "7.4.2"
androidGradlePlugin = "8.7.2"
androidxActivity = "1.6.1"
androidxAnnotation = "1.6.0"
androidxAppCompat = "1.5.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions owncloudApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions owncloudApp/src/main/java/com/owncloud/android/workers/DownloadFileWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class DownloadFileWorker(
appContext,
System.currentTimeMillis().toInt(),
updateCredentialsIntent,
PendingIntent.FLAG_ONE_SHOT
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
)
}

Expand All @@ -326,7 +326,7 @@ class DownloadFileWorker(
appContext,
System.currentTimeMillis().toInt(),
showDetailsIntent,
0
PendingIntent.FLAG_IMMUTABLE
)
}

Expand Down
9 changes: 9 additions & 0 deletions owncloudComLibrary/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ android {
targetSdkVersion sdkTargetVersion
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

lint {
abortOnError false
ignoreWarnings true
Expand Down
10 changes: 5 additions & 5 deletions owncloudData/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ android {
}
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

sourceSets {
Expand Down
10 changes: 5 additions & 5 deletions owncloudDomain/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ android {
}
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

sourceSets {
Expand Down
9 changes: 9 additions & 0 deletions owncloudTestUtil/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ android {
targetSdkVersion sdkTargetVersion
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildTypes {
release {
minifyEnabled false
Expand Down
Loading