File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- import org.jetbrains.kotlin. gradle.dsl.JvmTarget
1+ import org.gradle.api.JavaVersion
22
33plugins {
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}"
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -30,5 +30,5 @@ android.uniquePackageNames=false
3030android.dependency.useConstraints =true
3131android.r8.strictFullModeForKeepRules =false
3232android.r8.optimizedResourceShrinking =false
33- android.builtInKotlin =false
34- android.newDsl =false
33+ android.builtInKotlin =true
34+ android.newDsl =true
You can’t perform that action at this time.
0 commit comments