From 455b5eeae69a272a7a1ca2293d039477f4395795 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 12 Jul 2025 18:08:13 -0700 Subject: [PATCH] Clean up gradle files Removed deprecated j-center, and commented out dependencies. --- android-smsmms/build.gradle | 2 -- build.gradle | 3 +-- common/build.gradle | 1 - data/build.gradle | 6 ------ domain/build.gradle | 5 ----- gradle.properties | 1 - presentation/build.gradle | 7 +++---- 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 9c8c996f..61e3b2f7 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -41,7 +41,6 @@ dependencies { implementation 'com.squareup.okhttp:okhttp:2.5.0' implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -// implementation 'javax.annotation:javax.annotation-api:1.3.2' } repositories { @@ -53,5 +52,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1e6de0b2..de3e2c1d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ buildscript { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } dependencies { @@ -72,7 +71,7 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/common/build.gradle b/common/build.gradle index f240c7c4..01bfcc38 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -48,5 +48,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/data/build.gradle b/data/build.gradle index 1ca9a517..7077cecd 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -22,7 +22,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 - publishNonDefault true compileOptions { sourceCompatibility 1.8 @@ -33,8 +32,6 @@ android { minSdk 23 targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" } namespace 'dev.octoshrimpy.quik.data' @@ -59,8 +56,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // rxjava @@ -109,5 +104,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/domain/build.gradle b/domain/build.gradle index 2d07c9c1..9c0d0c16 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -46,8 +46,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // realm @@ -70,8 +68,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(":common") -// implementation 'com.github.pengrad:jdk9-deps:1ffe84c' - } repositories { @@ -83,5 +79,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/gradle.properties b/gradle.properties index 9d2f340c..887e2632 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m org.gradle.caching=true android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/presentation/build.gradle b/presentation/build.gradle index 00f16f65..ef9cd9c0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -87,6 +87,9 @@ android { abortOnError false } namespace 'dev.octoshrimpy.quik' + buildFeatures { + buildConfig true + } if (System.getenv("CI") == "true") { signingConfigs.release.storePassword = System.getenv("keystore_password") signingConfigs.release.keyAlias = System.getenv("key_alias") @@ -147,11 +150,8 @@ dependencies { implementation "com.google.dagger:dagger-android-support:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" -// compileOnly "javax.annotation:jsr250-api:1.0" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // ezvcard @@ -163,7 +163,6 @@ dependencies { // realm implementation "com.github.realm:realm-android-adapters:$realm_adapters_version" -// implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" kapt "io.realm:realm-annotations-processor:$realm_version"