mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Update Gradle plugin to 7.1.0, preferences and fragment

Browse source 
remove Room incremental annotation processor flag, it's now enabled by default
This commit is contained in:
Christophe Beyls 2022-01-28 13:23:12 +01:00
parent bfddd11991
commit ba842f9606
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/build.gradle
View file

@ -20,12 +20,6 @@ android {
// Supported languages
resConfigs "en"
vectorDrawables.useSupportLibrary = true
javaCompileOptions {
annotationProcessorOptions {
arguments += ["room.incremental": "true"]
}
}
}
sourceSets {
@ -80,20 +74,22 @@ afterEvaluate {
// Update configuration of the R8 tasks to optimize desugaring shrinker
def originalSetting = "\"support_all_callbacks_from_library\": true"
def replacementSetting = "\"support_all_callbacks_from_library\": false"
tasks.findAll { task -> task.getClass().getSimpleName().startsWith("R8Task") }.each { task ->
task.configure {
def patchedDesugarConfig = coreLibDesugarConfig.getProvider().map {
it.replace(originalSetting, replacementSetting)
tasks.forEach { task ->
def taskSimpleName = task.getClass().getSimpleName()
if (taskSimpleName.startsWith("R8Task")) {
task.configure {
def patchedDesugarConfig = coreLibDesugarConfig.getProvider().map {
it.replace(originalSetting, replacementSetting)
}
coreLibDesugarConfig.set(patchedDesugarConfig)
}
coreLibDesugarConfig.set(patchedDesugarConfig)
}
}
tasks.findAll { task -> task.getClass().getSimpleName().startsWith("L8DexDesugarLibTask") }.each { task ->
task.configure {
def patchedDesugarConfig = libConfiguration.getProvider().map {
it.replace(originalSetting, replacementSetting)
} else if (taskSimpleName.startsWith("L8DexDesugarLibTask")) {
task.configure {
def patchedDesugarConfig = libConfiguration.getProvider().map {
it.replace(originalSetting, replacementSetting)
}
libConfiguration.set(patchedDesugarConfig)
}
libConfiguration.set(patchedDesugarConfig)
}
}
}
@ -111,14 +107,14 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.activity:activity-ktx:1.4.0'
implementation 'androidx.fragment:fragment-ktx:1.4.0'
implementation 'androidx.fragment:fragment-ktx:1.4.1'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.browser:browser:1.4.0'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

2
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip