From e65a033704c64c8ca8aeb9db3d977d9eb5409e02 Mon Sep 17 00:00:00 2001 From: David Madl Date: Wed, 13 May 2026 20:19:52 +0200 Subject: [PATCH] chore: finish porting build .kts to .gradle --- build.gradle | 3 ++ build.gradle.kts | 3 -- gradle.properties | 1 - jukebox/build.gradle | 41 ++++++++++++++++++++++++++ jukebox/build.gradle.kts | 39 ------------------------ settings.gradle.kts => settings.gradle | 4 +-- 6 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 build.gradle delete mode 100644 build.gradle.kts create mode 100644 jukebox/build.gradle delete mode 100644 jukebox/build.gradle.kts rename settings.gradle.kts => settings.gradle (82%) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2306bbb --- /dev/null +++ b/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'com.android.library' version '8.7.2' apply false +} diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index e3a4cf8..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -plugins { - id("com.android.library") version "8.7.2" apply false -} diff --git a/gradle.properties b/gradle.properties index f0a2e55..2e11322 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true -kotlin.code.style=official android.nonTransitiveRClass=true diff --git a/jukebox/build.gradle b/jukebox/build.gradle new file mode 100644 index 0000000..f08a24b --- /dev/null +++ b/jukebox/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'com.android.library' +} + +android { + namespace 'at.lockstep.jukebox' + compileSdk 35 + + defaultConfig { + minSdk 24 + consumerProguardFiles 'consumer-rules.pro' + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + testOptions { + unitTests { + includeAndroidResources = true + } + } +} + +dependencies { + def room = '2.6.1' + implementation "androidx.room:room-runtime:$room" + implementation 'androidx.lifecycle:lifecycle-livedata:2.8.7' + annotationProcessor "androidx.room:room-compiler:$room" + testImplementation "androidx.room:room-testing:$room" + + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.retrofit2:retrofit:2.11.0' + implementation 'com.squareup.retrofit2:converter-gson:2.11.0' + implementation 'com.google.code.gson:gson:2.11.0' + + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'androidx.test:core:1.6.1' +} diff --git a/jukebox/build.gradle.kts b/jukebox/build.gradle.kts deleted file mode 100644 index 3a94700..0000000 --- a/jukebox/build.gradle.kts +++ /dev/null @@ -1,39 +0,0 @@ -plugins { - id("com.android.library") -} - -android { - namespace = "at.lockstep.jukebox" - compileSdk = 35 - - defaultConfig { - minSdk = 24 - consumerProguardFiles("consumer-rules.pro") - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - testOptions { - unitTests.isIncludeAndroidResources = true - } -} - -dependencies { - val room = "2.6.1" - implementation("androidx.room:room-runtime:$room") - implementation("androidx.lifecycle:lifecycle-livedata:2.8.7") - annotationProcessor("androidx.room:room-compiler:$room") - testImplementation("androidx.room:room-testing:$room") - - implementation("com.squareup.okhttp3:okhttp:4.12.0") - implementation("com.squareup.retrofit2:retrofit:2.11.0") - implementation("com.squareup.retrofit2:converter-gson:2.11.0") - implementation("com.google.code.gson:gson:2.11.0") - - testImplementation("junit:junit:4.13.2") - testImplementation("org.robolectric:robolectric:4.14.1") - testImplementation("androidx.test:core:1.6.1") -} diff --git a/settings.gradle.kts b/settings.gradle similarity index 82% rename from settings.gradle.kts rename to settings.gradle index 67a897c..d5008fc 100644 --- a/settings.gradle.kts +++ b/settings.gradle @@ -14,5 +14,5 @@ dependencyResolutionManagement { } } -rootProject.name = "lockstep-jukebox" -include(":jukebox") +rootProject.name = 'lockstep-jukebox' +include ':jukebox'