make use of coreLibraryDesugaring to showcase bundletool error

mtotschnig · Sep 22, 2020 · af6cec9 · af6cec9
1 parent 3d37e1a
commit af6cec9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/DynamicCodeLoadingKotlin/app/build.gradle b/DynamicCodeLoadingKotlin/app/build.gradle
@@ -7,11 +7,12 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.google.android.samples.dynamiccodeloading"
-        minSdkVersion 21
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode 33
         versionName "1.0.33"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         debugR8 {
@@ -27,6 +28,12 @@ android {
         }
     }
 
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     flavorDimensions "codeLoading"
 
     productFlavors {
@@ -47,6 +54,7 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

diff --git a/DynamicCodeLoadingKotlin/build.gradle b/DynamicCodeLoadingKotlin/build.gradle
@@ -11,8 +11,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools:r8:878ec25559ca91497517345ec3a6c16102b7025c'  // Must be before the Gradle Plugin for Android.
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/DynamicCodeLoadingKotlin/gradle/wrapper/gradle-wrapper.properties b/DynamicCodeLoadingKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -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-5.4-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip