Skip to content

gradle update + dependencies updates + minor changes #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down Expand Up @@ -63,8 +55,8 @@ allprojects {
}

ext {
compileSdkVersion = 30
compileSdkVersion = 31

minSdkVersion = 16
targetSdkVersion = 30
minSdkVersion = 21
targetSdkVersion = 31
}
1 change: 1 addition & 0 deletions coroutines/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion facebook/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions fcm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions google/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions ktx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions parse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand All @@ -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"
Expand Down Expand Up @@ -92,11 +93,3 @@ jacocoAndroidUnitTestReport {
}

//endregion

//region Coveralls

apply plugin: "com.github.kt3k.coveralls"

coveralls.jacocoReportPath = "${buildDir}/jacoco/jacoco.xml"

//endregion
3 changes: 2 additions & 1 deletion rxjava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
}

Expand Down
17 changes: 16 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -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'
3 changes: 2 additions & 1 deletion twitter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")

Expand Down