forked from upstream-mirrors/quik
Clean up gradle files
Removed deprecated j-center, and commented out dependencies.
This commit is contained in:
@@ -41,7 +41,6 @@ dependencies {
|
|||||||
implementation 'com.squareup.okhttp:okhttp:2.5.0'
|
implementation 'com.squareup.okhttp:okhttp:2.5.0'
|
||||||
implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
|
implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
// implementation 'javax.annotation:javax.annotation-api:1.3.2'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -53,5 +52,4 @@ repositories {
|
|||||||
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
+1
-2
@@ -46,7 +46,6 @@ buildscript {
|
|||||||
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -72,7 +71,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
tasks.register('clean', Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,5 +48,4 @@ repositories {
|
|||||||
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ apply plugin: 'kotlin-kapt'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk 34
|
compileSdk 34
|
||||||
publishNonDefault true
|
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility 1.8
|
sourceCompatibility 1.8
|
||||||
@@ -33,8 +32,6 @@ android {
|
|||||||
minSdk 23
|
minSdk 23
|
||||||
targetSdkVersion 33
|
targetSdkVersion 33
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace 'dev.octoshrimpy.quik.data'
|
namespace 'dev.octoshrimpy.quik.data'
|
||||||
@@ -59,8 +56,6 @@ dependencies {
|
|||||||
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
||||||
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
|
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
|
||||||
implementation 'com.github.pengrad:jdk9-deps:1ffe84c468'
|
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'
|
implementation 'javax.annotation:javax.annotation-api:1.3.2'
|
||||||
|
|
||||||
// rxjava
|
// rxjava
|
||||||
@@ -109,5 +104,4 @@ repositories {
|
|||||||
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,8 +46,6 @@ dependencies {
|
|||||||
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
||||||
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
|
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
|
||||||
implementation 'com.github.pengrad:jdk9-deps:1ffe84c468'
|
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'
|
implementation 'javax.annotation:javax.annotation-api:1.3.2'
|
||||||
|
|
||||||
// realm
|
// realm
|
||||||
@@ -70,8 +68,6 @@ dependencies {
|
|||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
implementation project(":common")
|
implementation project(":common")
|
||||||
|
|
||||||
// implementation 'com.github.pengrad:jdk9-deps:1ffe84c'
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -83,5 +79,4 @@ repositories {
|
|||||||
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
url 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
|
|||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
android.defaults.buildfeatures.buildconfig=true
|
|
||||||
android.nonTransitiveRClass=false
|
android.nonTransitiveRClass=false
|
||||||
android.nonFinalResIds=false
|
android.nonFinalResIds=false
|
||||||
|
|
||||||
|
|||||||
@@ -87,6 +87,9 @@ android {
|
|||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
namespace 'dev.octoshrimpy.quik'
|
namespace 'dev.octoshrimpy.quik'
|
||||||
|
buildFeatures {
|
||||||
|
buildConfig true
|
||||||
|
}
|
||||||
if (System.getenv("CI") == "true") {
|
if (System.getenv("CI") == "true") {
|
||||||
signingConfigs.release.storePassword = System.getenv("keystore_password")
|
signingConfigs.release.storePassword = System.getenv("keystore_password")
|
||||||
signingConfigs.release.keyAlias = System.getenv("key_alias")
|
signingConfigs.release.keyAlias = System.getenv("key_alias")
|
||||||
@@ -147,11 +150,8 @@ dependencies {
|
|||||||
implementation "com.google.dagger:dagger-android-support:$dagger_version"
|
implementation "com.google.dagger:dagger-android-support:$dagger_version"
|
||||||
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
||||||
kapt "com.google.dagger:dagger-android-processor:$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
|
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
|
||||||
implementation 'com.github.pengrad:jdk9-deps:1ffe84c468'
|
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'
|
implementation 'javax.annotation:javax.annotation-api:1.3.2'
|
||||||
|
|
||||||
// ezvcard
|
// ezvcard
|
||||||
@@ -163,7 +163,6 @@ dependencies {
|
|||||||
|
|
||||||
// realm
|
// realm
|
||||||
implementation "com.github.realm:realm-android-adapters:$realm_adapters_version"
|
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:$realm_version"
|
||||||
kapt "io.realm:realm-annotations-processor:$realm_version"
|
kapt "io.realm:realm-annotations-processor:$realm_version"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user