diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 00f680b..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,93 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' -} - -android { - namespace 'com.franco.demomode' - compileSdk 33 - - defaultConfig { - applicationId "com.franco.demomode" - minSdk 24 - targetSdk 33 - versionName "1.6" - versionCode 1910030257 - archivesBaseName = "DemoModeTile-${android.defaultConfig.versionName}" - } - - signingConfigs { - release { - readKeystoreProperties('release') - } - - debug { - readKeystoreProperties('debug') - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - - lintOptions { - abortOnError false - checkAllWarnings false - disable 'InvalidPackage' - } - - packagingOptions { - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - } - - buildTypes { - release { - debuggable false - minifyEnabled true - shrinkResources true - signingConfig signingConfigs.release - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - - debug { - minifyEnabled false - shrinkResources false - } - } - - buildFeatures { - viewBinding = true - } - kotlinOptions { - jvmTarget = '11' - } -} - -def readKeystoreProperties(def configName) { - def propsFile = rootProject.file('../../keystore.properties') - - if (propsFile.exists()) { - def props = new Properties() - props.load(new FileInputStream(propsFile)) - android.signingConfigs[configName].storeFile = file(props['storeFile']) - android.signingConfigs[configName].storePassword = props['storePassword'] - android.signingConfigs[configName].keyAlias = props['keyAlias'] - android.signingConfigs[configName].keyPassword = props['keyPassword'] - } -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' - implementation 'androidx.preference:preference-ktx:1.2.0' - implementation "androidx.fragment:fragment-ktx:1.5.7" - implementation "androidx.core:core-ktx:1.10.1" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' - - def lifecycle_version = "2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..fa51250 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + id("com.android.application") + id("kotlin-android") +} + +android { + namespace = "com.franco.demomode" + compileSdk = 33 + + defaultConfig { + applicationId = "com.franco.demomode" + minSdk = 24 + targetSdk = 33 + versionName = "1.6" + versionCode = 1910030257 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + lintOptions { + isAbortOnError = false + isCheckAllWarnings = false + disable("InvalidPackage") + } + + packagingOptions { + exclude("META-INF/LICENSE.txt") + exclude("META-INF/NOTICE.txt") + } + + buildTypes { + release { + isDebuggable = false + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + + debug { + isMinifyEnabled = false + isShrinkResources = false + } + } + + buildFeatures { + viewBinding = true + } + kotlinOptions { + jvmTarget = "11" + } +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.9.0") + implementation("androidx.preference:preference-ktx:1.2.0") + implementation("androidx.fragment:fragment-ktx:1.5.7") + implementation("androidx.core:core-ktx:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + + val lifecycle_version = "2.6.1" + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version") + implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycle_version") +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a965f92..61d27cc 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -2,7 +2,7 @@ # By default, the flags in this file are appended to flags specified # in /usr/local/opt/android-sdk/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. +# directive in build.gradle.kts. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/build.gradle b/build.gradle deleted file mode 100644 index a30620e..0000000 --- a/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -plugins { - id 'com.android.application' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.8.0' apply false -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..3131f3a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("com.android.application") version "8.0.2" apply false + id("org.jetbrains.kotlin.android") version "1.8.0" apply false +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle.kts similarity index 94% rename from settings.gradle rename to settings.gradle.kts index b87d5ff..b76313a 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -12,4 +12,4 @@ dependencyResolutionManagement { mavenCentral() } } -include ':app' +include(":app")