diff --git a/app/build.gradle b/app/build.gradle index e563e786..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' @@ -95,8 +98,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' 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