From 549d323c5dea0e0d31ccafc7078fa09217776122 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 17:43:09 +0000 Subject: [PATCH 1/2] Bump the dagger group with 2 updates Bumps the dagger group with 2 updates: [com.google.dagger:dagger](https://github.com/google/dagger) and [com.google.dagger:dagger-compiler](https://github.com/google/dagger). Updates `com.google.dagger:dagger` from 2.28.3 to 2.56.2 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.28.3...dagger-2.56.2) Updates `com.google.dagger:dagger-compiler` from 2.28.3 to 2.56.2 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.28.3...dagger-2.56.2) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-version: 2.56.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dagger - dependency-name: com.google.dagger:dagger-compiler dependency-version: 2.56.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dagger ... Signed-off-by: dependabot[bot] --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e563e786..77941548 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,8 +95,8 @@ dependencies { def butterknifeVersion = '10.2.3' implementation "com.jakewharton:butterknife:10.2.3" annotationProcessor "com.jakewharton:butterknife-compiler:10.2.3" - implementation 'com.google.dagger:dagger:2.28.3' - annotationProcessor "com.google.dagger:dagger-compiler:2.28.3" + implementation 'com.google.dagger:dagger:2.56.2' + annotationProcessor "com.google.dagger:dagger-compiler:2.56.2" implementation 'com.github.bumptech.glide:glide:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' implementation 'jp.wasabeef:glide-transformations:4.3.0' From 657f675597cd7e4001399935084332cc2b7d4578 Mon Sep 17 00:00:00 2001 From: Gray Zhang Date: Wed, 9 Jul 2025 12:28:19 +0800 Subject: [PATCH 2/2] fix: Update Gradle and SDK versions for compatibility - Update Gradle wrapper to 8.13 for AGP 8.11.0 compatibility - Update compileSdk and targetSdk from 33 to 34 - Update AGP to 8.11.0 to match other dependencies - Add buildFeatures.buildConfig configuration - Disable proxy and add Gradle performance properties --- app/build.gradle | 7 +++++-- build.gradle | 2 +- gradle.properties | 10 ++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 77941548..4d5a1434 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdk 33 + compileSdk 34 + buildFeatures { + buildConfig true + } defaultConfig { applicationId "me.ghui.v2er" minSdkVersion 27 - targetSdkVersion 33 + targetSdkVersion 34 versionCode rootProject.ext.app.versionCode versionName rootProject.ext.app.versionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/build.gradle b/build.gradle index 74b832e8..8be199e1 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.11.0' } } diff --git a/gradle.properties b/gradle.properties index 3d505c44..264802dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sat Mar 04 11:07:15 CST 2017 -org.gradle.jvmargs=-Xmx1536M \ +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ @@ -22,10 +22,12 @@ org.gradle.jvmargs=-Xmx1536M \ --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -systemProp.http.proxyPort=6153 +# systemProp.http.proxyPort=6153 android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1db5f0..2733ed5d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists