Skip to content

Commit 3d439ff

Browse files
JawnnypooJawnnypoo
authored
Update dependencies (#994)
1 parent 4b672b2 commit 3d439ff

File tree

11 files changed

+59
-48
lines changed

11 files changed

+59
-48
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ branches:
66
language: android
77

88
jdk:
9-
- oraclejdk8
9+
- openjdk8
1010

1111
before_install:
1212
- pip install --user codecov

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
implementation "com.github.parse-community.Parse-SDK-Android:ktx:latest.version.here"
3535
}
3636
```
37-
replacing `latest.version.here` with the latest released version (see JitPack badge above)
37+
replacing `latest.version.here` with the latest released version (see JitPack badge above).
3838

3939
### Setup
4040
Initialize Parse in a custom class that extends `Application`:

‎build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.21'
2+
ext.kotlin_version = "1.3.61"
33
repositories {
44
google()
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.1'
9-
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
8+
classpath "com.android.tools.build:gradle:3.5.2"
9+
classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3"
10+
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
}
1313
}
1414

1515
plugins {
16-
id 'com.github.ben-manes.versions' version '0.20.0'
16+
id "com.github.ben-manes.versions" version "0.27.0"
1717
}
1818

1919
allprojects {

‎coroutines/build.gradle

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
apply plugin: "com.android.library"
2+
apply plugin: "kotlin-android"
33

44
android {
55
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -13,24 +13,32 @@ android {
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
}
1515

16+
packagingOptions {
17+
exclude "**/BuildConfig.class"
18+
}
19+
1620
lintOptions {
1721
abortOnError false
1822
}
1923

2024
buildTypes {
2125
release {
2226
minifyEnabled false
23-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
27+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
2428
}
2529
}
2630

2731
}
2832

33+
ext {
34+
coroutinesVersion = "1.2.2"
35+
}
36+
2937
dependencies {
3038
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
31-
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2'
32-
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2'
33-
implementation project(':parse')
39+
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
40+
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
41+
implementation project(":parse")
3442
}
3543

36-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle'
44+
apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"

‎fcm/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.library'
1+
apply plugin: "com.android.library"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,7 +14,7 @@ android {
1414
}
1515

1616
packagingOptions {
17-
exclude '**/BuildConfig.class'
17+
exclude "**/BuildConfig.class"
1818
}
1919

2020
lintOptions {
@@ -24,15 +24,15 @@ android {
2424
buildTypes {
2525
release {
2626
minifyEnabled false
27-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
27+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
2828
}
2929
}
3030

3131
}
3232

3333
dependencies {
34-
api "com.google.firebase:firebase-messaging:17.3.4"
35-
implementation project(':parse')
34+
api "com.google.firebase:firebase-messaging:20.0.1"
35+
implementation project(":parse")
3636
}
3737

38-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle'
38+
apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"

‎gcm/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.library'
1+
apply plugin: "com.android.library"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,7 +14,7 @@ android {
1414
}
1515

1616
packagingOptions {
17-
exclude '**/BuildConfig.class'
17+
exclude "**/BuildConfig.class"
1818
}
1919

2020
lintOptions {
@@ -24,7 +24,7 @@ android {
2424
buildTypes {
2525
release {
2626
minifyEnabled false
27-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
27+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
2828
}
2929
}
3030

@@ -33,8 +33,8 @@ android {
3333
dependencies {
3434
// last version for GCM to be supported
3535
api "com.google.android.gms:play-services-gcm:12.0.1"
36-
api "com.firebase:firebase-jobdispatcher:0.8.5"
37-
implementation project(':parse')
36+
api "com.firebase:firebase-jobdispatcher:0.8.6"
37+
implementation project(":parse")
3838
}
3939

40-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle'
40+
apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"

‎gradle/wrapper/gradle-wrapper.jar

1.36 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Feb 14 09:49:29 CST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

‎gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

‎ktx/build.gradle

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
apply plugin: 'com.android.library'
1+
apply plugin: "com.android.library"
22

3-
apply plugin: 'kotlin-android'
3+
apply plugin: "kotlin-android"
44

55
android {
66
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -15,22 +15,26 @@ android {
1515

1616
}
1717

18+
packagingOptions {
19+
exclude "**/BuildConfig.class"
20+
}
21+
1822
lintOptions {
1923
abortOnError false
2024
}
2125

2226
buildTypes {
2327
release {
2428
minifyEnabled false
25-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
29+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
2630
}
2731
}
2832

2933
}
3034

3135
dependencies {
3236
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
33-
implementation project(':parse')
37+
implementation project(":parse")
3438
}
3539

36-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle'
40+
apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"

‎parse/build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'com.github.kt3k.coveralls'
1+
apply plugin: "com.android.library"
2+
apply plugin: "com.github.kt3k.coveralls"
33

44
android {
55
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -9,7 +9,7 @@ android {
99
targetSdkVersion rootProject.ext.targetSdkVersion
1010
versionCode 1
1111
versionName "1.0"
12-
consumerProguardFiles 'release-proguard.pro'
12+
consumerProguardFiles "release-proguard.pro"
1313
}
1414

1515
packagingOptions {
@@ -28,24 +28,24 @@ android {
2828
}
2929

3030
ext {
31-
okhttpVersion = '3.12.1'
31+
okhttpVersion = "3.14.4"
3232
}
3333

3434
dependencies {
35-
api "androidx.annotation:annotation:1.0.1"
36-
api "androidx.core:core:1.0.1"
37-
api 'com.parse.bolts:bolts-tasks:1.4.0'
35+
api "androidx.annotation:annotation:1.1.0"
36+
api "androidx.core:core:1.1.0"
37+
api "com.parse.bolts:bolts-tasks:1.4.0"
3838
api "com.squareup.okhttp3:okhttp:$okhttpVersion"
3939

40-
testImplementation 'org.robolectric:robolectric:3.8'
41-
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
42-
testImplementation 'org.mockito:mockito-core:1.10.19'
40+
testImplementation "org.robolectric:robolectric:3.8"
41+
testImplementation "org.skyscreamer:jsonassert:1.5.0"
42+
testImplementation "org.mockito:mockito-core:1.10.19"
4343
testImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
4444
}
4545

4646
//region Code Coverage
4747

48-
apply plugin: 'jacoco'
48+
apply plugin: "jacoco"
4949

5050
jacoco {
5151
toolVersion "0.7.1.201405082137"
@@ -85,4 +85,4 @@ coveralls.jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacoco
8585

8686
//endregion
8787

88-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle'
88+
apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"

0 commit comments

Comments
 (0)