diff --git a/README.md b/README.md index 667c3b18c..6ae767e8b 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,15 @@ allprojects { } } ``` +or alternatively in your settings.gradle file: + +```dependencyResolutionManagement { + repositories { + ... + maven { url "https://jitpack.io" } + } + } +``` Then, add the library to your project `build.gradle` ```gradle diff --git a/build.gradle b/build.gradle index 53e066139..b18550ac3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" - classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3" - classpath "com.github.dcendents:android-maven-gradle-plugin:2.1" + classpath "com.android.tools.build:gradle:7.0.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jacoco:org.jacoco.core:$jacocoVersion" classpath "com.dicedmelon.gradle:jacoco-android:0.1.5" @@ -18,16 +16,10 @@ buildscript { } plugins { - id "com.github.ben-manes.versions" version "0.28.0" id "com.diffplug.spotless" version "5.16.0" } allprojects { - repositories { - google() - mavenCentral() - } - apply plugin: "com.diffplug.spotless" spotless { @@ -63,8 +55,8 @@ allprojects { } ext { - compileSdkVersion = 30 + compileSdkVersion = 31 - minSdkVersion = 16 - targetSdkVersion = 30 + minSdkVersion = 21 + targetSdkVersion = 31 } diff --git a/coroutines/build.gradle b/coroutines/build.gradle index ff9395446..7642afbdf 100644 --- a/coroutines/build.gradle +++ b/coroutines/build.gradle @@ -29,6 +29,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/facebook/build.gradle b/facebook/build.gradle index fe481cd45..7f5727879 100644 --- a/facebook/build.gradle +++ b/facebook/build.gradle @@ -28,6 +28,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -40,7 +41,7 @@ dependencies { testImplementation "junit:junit:4.13.2" testImplementation "org.mockito:mockito-core:3.9.0" - testImplementation "org.robolectric:robolectric:4.6" + testImplementation "org.robolectric:robolectric:4.6.1" } afterEvaluate { diff --git a/fcm/build.gradle b/fcm/build.gradle index 25209a897..7bb37ac42 100644 --- a/fcm/build.gradle +++ b/fcm/build.gradle @@ -28,6 +28,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/google/build.gradle b/google/build.gradle index 1ceba9247..225c60856 100644 --- a/google/build.gradle +++ b/google/build.gradle @@ -16,6 +16,7 @@ android { abortOnError false } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 68ca99ac4..01795b22a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Oct 16 02:11:23 CEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/ktx/build.gradle b/ktx/build.gradle index 14b773df4..8e4d5cbb5 100644 --- a/ktx/build.gradle +++ b/ktx/build.gradle @@ -30,6 +30,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/parse/build.gradle b/parse/build.gradle index b362f628a..3668560d2 100644 --- a/parse/build.gradle +++ b/parse/build.gradle @@ -35,6 +35,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -43,7 +44,7 @@ android { ext { // Note: Don't update past 3.12.x, as it sets the minSdk to Android 5.0 - okhttpVersion = "3.12.10" + okhttpVersion = "4.9.1" } dependencies { @@ -53,7 +54,7 @@ dependencies { api project(':bolts-tasks') testImplementation 'junit:junit:4.13.2' - testImplementation "org.robolectric:robolectric:4.6" + testImplementation "org.robolectric:robolectric:4.6.1" testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "org.mockito:mockito-core:3.9.0" testImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion" @@ -92,11 +93,3 @@ jacocoAndroidUnitTestReport { } //endregion - -//region Coveralls - -apply plugin: "com.github.kt3k.coveralls" - -coveralls.jacocoReportPath = "${buildDir}/jacoco/jacoco.xml" - -//endregion diff --git a/rxjava/build.gradle b/rxjava/build.gradle index 047030f65..aaa736f4b 100644 --- a/rxjava/build.gradle +++ b/rxjava/build.gradle @@ -30,6 +30,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -42,7 +43,7 @@ android { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api "io.reactivex.rxjava3:rxjava:3.0.4" + api "io.reactivex.rxjava3:rxjava:3.1.1" implementation project(":parse") } diff --git a/settings.gradle b/settings.gradle index ada8e581f..bea28b715 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,16 @@ -include ':parse', ':fcm', ':ktx', ':coroutines', 'rxjava', ':google', ':facebook', ':twitter', ':bolts-tasks' +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +include ':parse', + ':fcm', + ':ktx', + ':coroutines', + 'rxjava', + ':google', + ':facebook', + ':twitter', + ':bolts-tasks' diff --git a/twitter/build.gradle b/twitter/build.gradle index b8dd37321..b0bd12302 100644 --- a/twitter/build.gradle +++ b/twitter/build.gradle @@ -28,6 +28,7 @@ android { } } + // Could actually be removed since implicitly declared with Gradle 7 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -36,7 +37,7 @@ android { dependencies { api "androidx.appcompat:appcompat:1.3.1" - api "oauth.signpost:signpost-core:1.2.1.2" + api "oauth.signpost:signpost-core:2.1.1" api "se.akerfeldt:okhttp-signpost:1.1.0" implementation project(":parse")