Merge pull request #54 from w4123/fix_compat

mzdluo123 · web-flow · commit 4a31b8a2552c · 2021-04-18T12:28:51.000+08:00
Fix compatibility issue with desugared plugins
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.android.build.gradle.internal.tasks.L8DexDesugarLibTask
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -87,6 +88,10 @@ android {
     configurations {
         nnio
     }
+
+    tasks.withType(L8DexDesugarLibTask) {
+        keepRulesFiles.from("desugar-rules.pro")
+    }
 }
 
 kotlin.sourceSets.all {
diff --git a/app/desugar-rules.pro b/app/desugar-rules.pro
@@ -0,0 +1 @@
+-keepclassmembers class ** { *; }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
	`2`	`+import com.android.build.gradle.internal.tasks.L8DexDesugarLibTask`
`2`	`3`
`3`	`4`	`apply plugin: 'com.android.application'`
`4`	`5`	`apply plugin: 'kotlin-android'`
`@@ -87,6 +88,10 @@ android {`
`87`	`88`	`configurations {`
`88`	`89`	`nnio`
`89`	`90`	`}`
	`91`	`+`
	`92`	`+ tasks.withType(L8DexDesugarLibTask) {`
	`93`	`+ keepRulesFiles.from("desugar-rules.pro")`
	`94`	`+ }`
`90`	`95`	`}`
`91`	`96`
`92`	`97`	`kotlin.sourceSets.all {`