diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index c3cd760..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,65 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - -apply plugin: 'kotlin-kapt' - -android { - compileSdkVersion 33 - buildToolsVersion '29.0.3' - defaultConfig { - applicationId "eu.depau.etchdroid" - minSdkVersion 21 - targetSdkVersion 33 - versionCode 13 - versionName "1.5.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables.useSupportLibrary = true - } - buildTypes { - release { - minifyEnabled true - shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - debug { - minifyEnabled false - shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - packagingOptions { - resources { - excludes += ['META-INF/libaums_release.kotlin_module'] - } - } - compileOptions { - encoding = 'UTF-8' - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - lintOptions { - abortOnError false - } - namespace 'eu.depau.etchdroid' -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core-ktx:1.3.2' - - implementation 'com.github.Depau:kotlet-android:v0.2.5' - - api 'com.github.EtchDroid:libaums_wrapper:v0.8.0' - api 'me.jahnen:libaums-libusbcommunication:0.1' - - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - testImplementation 'junit:junit:4.13.1' - testImplementation 'androidx.test:core:1.3.0' - testImplementation 'org.mockito:mockito-core:2.28.2' -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..7ec6605 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,72 @@ +@file:Suppress("UnstableApiUsage") + +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("kotlin-parcelize") +} + +android { + namespace = "eu.depau.etchdroid" + compileSdk = 33 + + defaultConfig { + applicationId = "eu.depau.etchdroid" + minSdk = 21 + targetSdk = 33 + versionCode = 20 + versionName = "2.0" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false + proguardFiles( + getDefaultProguardFile("proguard-android.txt"), + "proguard-rules.pro", + ) + } + } + packagingOptions { + resources { + excludes += "META-INF/libaums_release.kotlin_module" + } + } + compileOptions { + encoding = "UTF-8" + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + lintOptions { + isAbortOnError = false + } +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("androidx.core:core-ktx:1.9.0") + + implementation("com.github.Depau:kotlet-android:v0.2.5") + + api("com.github.EtchDroid:libaums_wrapper:v0.8.0") + api("me.jahnen.libaums:libusbcommunication:0.2.2") + + androidTestImplementation("androidx.test:runner:1.5.2") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + testImplementation("junit:junit:4.13.2") + testImplementation("androidx.test:core:1.5.0") + testImplementation("org.mockito:mockito-core:5.1.1") +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7380432..10990b7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. +# proguardFiles setting 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 ab9966c..0000000 --- a/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.4.21' - repositories { - jcenter() - google() - maven { url "https://jitpack.io" } - } - dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // For libaums - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - } -} - -allprojects { - repositories { - jcenter() - google() - maven { url "https://jitpack.io" } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..403e37c --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("com.android.application") version "7.4.1" apply false + id("com.android.library") version "7.4.1" apply false + id("org.jetbrains.kotlin.android") version "1.8.0" apply false +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6874df8..44b2a46 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 01 04:37:07 CET 2021 +#Mon Feb 20 20:20:52 CET 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..683763e --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + maven(url="https://jitpack.io") + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven(url = "https://jitpack.io") + } +} +rootProject.name = "EtchDroid" +include(":app")