Skip to content

Update gradle and other dependencies #1122

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 8 commits into from
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# [2.0.0](https://github.com/mobilekosmos/Parse-SDK-Android/compare/1.26.0...2.0.0) (2021-10-12)


### Bug Fixes

* remove GCM module ([#1091](https://github.com/mobilekosmos/Parse-SDK-Android/issues/1091)) ([aa16bcf](https://github.com/mobilekosmos/Parse-SDK-Android/commit/aa16bcfd9ef87319f032086f286e5768807f24a7))
* upgrade Facebook SDK ([#1105](https://github.com/mobilekosmos/Parse-SDK-Android/issues/1105)) ([6f4bdb0](https://github.com/mobilekosmos/Parse-SDK-Android/commit/6f4bdb0495e31dfb7c568a0269dc3dd8dd6b30c3))

### Features

* update all dependencies and modernize the source base ([#1095](https://github.com/mobilekosmos/Parse-SDK-Android/issues/1095)) ([a977d11](https://github.com/mobilekosmos/Parse-SDK-Android/commit/a977d117b02de826981ce6c50e85a2204d989b66))


### BREAKING CHANGES

* CHANGE

Support for Google Cloud Messaging (GCM) is removed, use Firebase Cloud Messaging instead. See the [Google developer documentation](https://developers.google.com/cloud-messaging/faq) for more details and migration assistance. ([aa16bcf](aa16bcf))

# [2.0.0](https://github.com/mtrezza/Parse-SDK-Android/compare/1.22.0...2.0.0) (2021-10-10)


Expand Down
21 changes: 16 additions & 5 deletions bolts-tasks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// This source code is licensed under the MIT license found in the/
// LICENSE file in the root directory of this source tree.

apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'java-library'
apply plugin: 'maven-publish'

dependencies {
compileOnly 'com.google.android:android:4.1.1.4'
Expand All @@ -14,12 +14,12 @@ dependencies {
javadoc.options.addStringOption('Xdoclint:none', '-quiet')

task sourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier.set("sources")
from sourceSets.main.allJava
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
task javadocJar (type: Jar, dependsOn: javadoc) {
archiveClassifier.set("javadoc")
from javadoc.destinationDir
}

Expand Down Expand Up @@ -48,4 +48,15 @@ jacocoTestReport {
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called "moralisPublication".
moralisPublication(MavenPublication) {
from components.java
}
}
}
}
20 changes: 5 additions & 15 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 @@ -17,23 +15,15 @@ buildscript {
}

plugins {
id "com.github.ben-manes.versions" version "0.28.0"
}

allprojects {
repositories {
google()
mavenCentral()
}
id "com.github.ben-manes.versions" version "0.39.0"
}

task clean(type: Delete) {
delete rootProject.buildDir
}

ext {
compileSdkVersion = 30

minSdkVersion = 16
targetSdkVersion = 30
compileSdkVersion = 31
minSdkVersion = 21
targetSdkVersion = 31
}
17 changes: 17 additions & 0 deletions coroutines/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"
apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -25,6 +26,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
testCoverageEnabled = false
}
debug {
testCoverageEnabled = true
}
}

Expand All @@ -47,4 +52,16 @@ dependencies {
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation project(":parse")
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}
15 changes: 14 additions & 1 deletion facebook/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.library"
apply plugin: 'maven-publish'
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"

Expand Down Expand Up @@ -32,5 +33,17 @@ 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 {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? It creates a maven publication "debug" but uses components "release".

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the name is not really relevant externally but I will double check.

// Applies the component for the debug build variant.
from components.release
}
}
}
}
17 changes: 17 additions & 0 deletions fcm/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: "com.android.library"
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"
apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -24,6 +25,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
testCoverageEnabled = false
}
debug {
testCoverageEnabled = true
}
}

Expand All @@ -37,4 +42,16 @@ android {
dependencies {
api "com.google.firebase:firebase-messaging:22.0.0"
implementation project(":parse")
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}
15 changes: 14 additions & 1 deletion google/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"
apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand Down Expand Up @@ -32,7 +33,19 @@ android {
}

dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "com.google.android.gms:play-services-auth:19.2.0"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(":parse")
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk11
17 changes: 17 additions & 0 deletions ktx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"
apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -28,6 +29,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
testCoverageEnabled = false
}
debug {
testCoverageEnabled = true
}
}

Expand All @@ -44,4 +49,16 @@ android {
dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(":parse")
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}
26 changes: 17 additions & 9 deletions parse/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: "com.android.library"
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"
apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand Down Expand Up @@ -31,6 +32,9 @@ android {
debug {
testCoverageEnabled = true
}
release {
testCoverageEnabled = false
}
}

compileOptions {
Expand All @@ -40,8 +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 @@ -51,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 @@ -81,10 +84,15 @@ jacocoAndroidUnitTestReport {

//endregion

//region Coveralls

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

coveralls.jacocoReportPath = "${buildDir}/jacoco/jacoco.xml"
afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}

//endregion
22 changes: 19 additions & 3 deletions rxjava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "io.freefair.android-javadoc-jar"
apply plugin: "io.freefair.android-sources-jar"

apply plugin: 'maven-publish'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -26,6 +26,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
testCoverageEnabled = false
}
debug {
testCoverageEnabled = true
}
}

Expand All @@ -40,7 +44,19 @@ android {
}

dependencies {
api "io.reactivex.rxjava3:rxjava:3.1.1"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "io.reactivex.rxjava3:rxjava:3.0.4"
implementation project(":parse")
}
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called “debug”.
debug(MavenPublication) {
// Applies the component for the debug build variant.
from components.release
}
}
}
}
Loading