diff --git a/app/build.gradle b/app/build.gradle index b11416fa8..0514655a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,6 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'kotlinx-serialization' configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' exclude module: "commons-logging" } diff --git a/build.gradle b/build.gradle index c77dca85f..5d826aa50 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { repositories { - mavenLocal() google() mavenCentral() } @@ -14,6 +13,7 @@ buildscript { allprojects { repositories { + mavenCentral() maven { url "https://raw.github.com/signalapp/maven/master/photoview/releases/" content { @@ -52,4 +52,8 @@ allprojects { } google() } + + project.ext { + androidCompileSdkVersion = 30 + } } \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f05084afb..2bce14c43 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'java-gradle-plugin' repositories { google() + mavenCentral() } dependencies { diff --git a/gradle.properties b/gradle.properties index a017cc944..ac70988e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ android.useAndroidX=true android.enableJetifier=true org.gradle.jvmargs=-Xmx2048m -androidCompileSdkVersion=30 kotlinVersion=1.4.32 kovenantVersion=3.3.0 curve25519Version=0.5.0 diff --git a/libsignal/build.gradle b/libsignal/build.gradle index 12ca86a86..ff0ef4777 100644 --- a/libsignal/build.gradle +++ b/libsignal/build.gradle @@ -1,19 +1,10 @@ apply plugin: 'com.android.library' -apply plugin: 'maven' apply plugin: 'kotlin-android' android { compileSdkVersion androidCompileSdkVersion } -repositories { - mavenCentral() -} - -configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' -} - dependencies { implementation "androidx.annotation:annotation:1.2.0" implementation "com.google.protobuf:protobuf-java:$protobufVersion"