Skip to content

Commit e03b8c2

Browse files
committed
cleanup non r8 confs
1 parent b81b9a3 commit e03b8c2

File tree

1 file changed

+0
-18
lines changed
  • example/androidlib/kotlin/1-hello-kotlin

1 file changed

+0
-18
lines changed

example/androidlib/kotlin/1-hello-kotlin/build.mill

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ object app extends AndroidAppKotlinModule {
4343

4444
override def androidIsDebug: T[Boolean] = Task { false }
4545

46-
override def androidReleaseSettings: T[AndroidBuildTypeSettings] = Task {
47-
super.androidReleaseSettings()
48-
.withDefaultProguardFile("proguard-android.txt")
49-
.withProguardLocalFiles(
50-
Seq(
51-
moduleDir / "proguard-rules.pro"
52-
)
53-
)
54-
}
55-
5646
object test extends AndroidAppKotlinTests with TestModule.Junit4 {
5747
def junit4Version = "4.13.2"
5848
}
@@ -68,14 +58,6 @@ object app extends AndroidAppKotlinModule {
6858
false
6959
}
7060

71-
override def androidReleaseSettings: T[AndroidBuildTypeSettings] = Task {
72-
AndroidBuildTypeSettings(isMinifyEnabled = false)
73-
}
74-
75-
/* TODO currently the dependency resolution ignores the platform type and kotlinx-coroutines-core has
76-
* conflicting classes with kotlinx-coroutines-core-jvm . Remove the exclusions once the dependency
77-
* resolution resolves conflicts between androidJvm and jvm platform types
78-
*/
7961
def mvnDeps = super.mvnDeps() ++ Seq(
8062
mvn"androidx.test.ext:junit:1.2.1",
8163
mvn"androidx.test:runner:1.6.2",

0 commit comments

Comments
 (0)