Skip to content

Commit 0e74688

Browse files
upgrade to new DSL or whatever
1 parent bdedb2e commit 0e74688

3 files changed

Lines changed: 8 additions & 12 deletions

File tree

app/build.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1+
import org.gradle.api.JavaVersion
22

33
plugins {
44
id("com.android.application")
5-
id("kotlin-android")
65
id("io.gitlab.arturbosch.detekt").version("1.23.8")
76
}
87

@@ -21,8 +20,11 @@ android {
2120
vectorDrawables {
2221
useSupportLibrary = true
2322
}
23+
}
2424

25-
resourceConfigurations.addAll(listOf("en"))
25+
androidResources {
26+
@Suppress("UnstableApiUsage")
27+
localeFilters += "en"
2628
}
2729

2830
buildTypes {
@@ -31,7 +33,7 @@ android {
3133
isShrinkResources = true
3234
proguardFiles(
3335
getDefaultProguardFile("proguard-android-optimize.txt"),
34-
"proguard-rules.pro"
36+
"proguard-rules.pro",
3537
)
3638
}
3739
}
@@ -40,11 +42,6 @@ android {
4042
targetCompatibility = JavaVersion.VERSION_11
4143
isCoreLibraryDesugaringEnabled = true
4244
}
43-
kotlin {
44-
compilerOptions {
45-
jvmTarget = JvmTarget.JVM_11
46-
}
47-
}
4845
packaging {
4946
resources {
5047
excludes += "/META-INF/{AL2.0,LGPL2.1}"

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ buildscript {
66
}
77
dependencies {
88
classpath("com.android.tools.build:gradle:9.2.1")
9-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
109
}
1110
}
1211

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ android.uniquePackageNames=false
3030
android.dependency.useConstraints=true
3131
android.r8.strictFullModeForKeepRules=false
3232
android.r8.optimizedResourceShrinking=false
33-
android.builtInKotlin=false
34-
android.newDsl=false
33+
android.builtInKotlin=true
34+
android.newDsl=true

0 commit comments

Comments
 (0)