diff --git a/app/build.gradle b/app/build.gradle index bcaf53c6..35f31876 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,18 +75,14 @@ dependencies { implementation dependenciesList.androidxRecyclerView implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.androidxCardView + implementation dependenciesList.androidxAppcompat + implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.gmsLocation // Logging implementation dependenciesList.timber - // Butter Knife - implementation dependenciesList.butterknife - annotationProcessor dependenciesList.butterknifeProcessor - implementation dependenciesList.androidxAppcompat - implementation dependenciesList.androidxConstraintLayout - // Leak Canary debugImplementation dependenciesList.leakCanaryDebug diff --git a/gradle.properties b/gradle.properties index 39cbbedc..f062e1e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,10 +17,7 @@ POM_DEVELOPER_NAME=Mapbox # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048M \ - --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 +org.gradle.jvmargs=-Xmx2048M android.useAndroidX=true android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index cf82e030..51e4e5ac 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -27,7 +27,6 @@ ext { mockito : '5.12.0', hamcrest : '2.0.0.0', errorprone : '2.28.0', - butterknife : '10.2.3', leakCanaryVersion : '2.14', timber : '5.0.1', testRunnerVersion : '1.0.1', @@ -66,10 +65,6 @@ ext { autoValueAnnotations : "com.google.auto.value:auto-value-annotations:${version.autoValue}", autoValueGson : "com.ryanharter.auto.value:auto-value-gson:${version.autoValueGson}", - // butterknife - butterknife : "com.jakewharton:butterknife:${version.butterknife}", - butterknifeProcessor : "com.jakewharton:butterknife-compiler:${version.butterknife}", - // support androidxAppcompat : "androidx.appcompat:appcompat:${version.appcompatVersion}", androidxCore : "androidx.core:core-ktx:${version.androidxCoreVersion}",