Merge branch 'feature/enable-desugaring' into develop
This commit is contained in:
commit
33eb4ce735
@ -20,6 +20,8 @@ ext {
|
|||||||
androidSupportAppcompatVersion = '1.2.0'
|
androidSupportAppcompatVersion = '1.2.0'
|
||||||
androidSupportDesignVersion = '1.3.0'
|
androidSupportDesignVersion = '1.3.0'
|
||||||
|
|
||||||
|
coreDesugaringVersion = '1.0.9'
|
||||||
|
|
||||||
// app frameworks and utilities
|
// app frameworks and utilities
|
||||||
|
|
||||||
rxJavaVersion = '2.2.21'
|
rxJavaVersion = '2.2.21'
|
||||||
@ -93,6 +95,8 @@ ext {
|
|||||||
|
|
||||||
jsonWebTokenApiVersion = '0.11.2'
|
jsonWebTokenApiVersion = '0.11.2'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
android : "com.google.android:android:${androidVersion}",
|
android : "com.google.android:android:${androidVersion}",
|
||||||
androidAnnotations : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}",
|
androidAnnotations : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}",
|
||||||
@ -112,6 +116,7 @@ ext {
|
|||||||
dagger : "com.google.dagger:dagger:${daggerVersion}",
|
dagger : "com.google.dagger:dagger:${daggerVersion}",
|
||||||
daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}",
|
daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}",
|
||||||
design : "com.google.android.material:material:${androidSupportDesignVersion}",
|
design : "com.google.android.material:material:${androidSupportDesignVersion}",
|
||||||
|
coreDesugaring : "com.android.tools:desugar_jdk_libs:${coreDesugaringVersion}",
|
||||||
dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
|
dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
|
||||||
espresso : "androidx.test.espresso:espresso-core:${espressoVersion}",
|
espresso : "androidx.test.espresso:espresso-core:${espressoVersion}",
|
||||||
googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
|
googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
|
||||||
|
@ -24,6 +24,8 @@ android {
|
|||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
coreLibraryDesugaringEnabled true
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
@ -92,6 +94,8 @@ dependencies {
|
|||||||
implementation project(':msa-auth-for-android')
|
implementation project(':msa-auth-for-android')
|
||||||
implementation project(':pcloud-sdk-java')
|
implementation project(':pcloud-sdk-java')
|
||||||
|
|
||||||
|
coreLibraryDesugaring dependencies.coreDesugaring
|
||||||
|
|
||||||
// cryptomator
|
// cryptomator
|
||||||
implementation dependencies.cryptolib
|
implementation dependencies.cryptolib
|
||||||
|
|
||||||
|
@ -23,6 +23,8 @@ android {
|
|||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
coreLibraryDesugaringEnabled true
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
@ -41,6 +43,8 @@ dependencies {
|
|||||||
annotationProcessor project(':generator')
|
annotationProcessor project(':generator')
|
||||||
annotationProcessor dependencies.daggerCompiler
|
annotationProcessor dependencies.daggerCompiler
|
||||||
|
|
||||||
|
coreLibraryDesugaring dependencies.coreDesugaring
|
||||||
|
|
||||||
compileOnly dependencies.javaxAnnotation
|
compileOnly dependencies.javaxAnnotation
|
||||||
|
|
||||||
api dependencies.timber
|
api dependencies.timber
|
||||||
|
@ -34,6 +34,8 @@ android {
|
|||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
coreLibraryDesugaringEnabled true
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
@ -122,6 +124,8 @@ dependencies {
|
|||||||
implementation project(':data')
|
implementation project(':data')
|
||||||
implementation project(':pcloud-sdk-android')
|
implementation project(':pcloud-sdk-android')
|
||||||
|
|
||||||
|
coreLibraryDesugaring dependencies.coreDesugaring
|
||||||
|
|
||||||
// dagger
|
// dagger
|
||||||
kapt dependencies.daggerCompiler
|
kapt dependencies.daggerCompiler
|
||||||
implementation dependencies.dagger
|
implementation dependencies.dagger
|
||||||
|
Loading…
x
Reference in New Issue
Block a user