Skip to content

Commit 29c45f4

Browse files
authored
Convert project to use AndroidX (#926)
1 parent f2e6475 commit 29c45f4

20 files changed

+29
-33
lines changed

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.71'
2+
ext.kotlin_version = '1.3.21'
33
repositories {
44
google()
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.1.3'
8+
classpath 'com.android.tools.build:gradle:3.3.1'
99
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -28,12 +28,10 @@ task clean(type: Delete) {
2828
}
2929

3030
ext {
31-
compileSdkVersion = 27
32-
33-
supportLibVersion = '27.1.1'
31+
compileSdkVersion = 28
3432

3533
firebaseJobdispatcherVersion = '0.8.5'
3634

3735
minSdkVersion = 14
38-
targetSdkVersion = 27
36+
targetSdkVersion = 28
3937
}

fcm/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
versionCode 1
1010
versionName "1.0"
1111

12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313

1414
}
1515

fcm/src/main/java/com/parse/fcm/ParseFirebaseInstanceIdService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse.fcm;
1010

11-
import android.support.annotation.CallSuper;
11+
import androidx.annotation.CallSuper;
1212

1313
import com.google.firebase.iid.FirebaseInstanceIdService;
1414
import com.parse.ParseInstallation;

gcm/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
versionCode 1
1010
versionName "1.0"
1111

12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313

1414
}
1515

gcm/src/main/java/com/parse/gcm/ParseGCM.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import android.content.Context;
1212
import android.os.Bundle;
13-
import android.support.annotation.NonNull;
14-
import android.support.annotation.Nullable;
13+
import androidx.annotation.NonNull;
14+
import androidx.annotation.Nullable;
1515

1616
import com.firebase.jobdispatcher.FirebaseJobDispatcher;
1717
import com.firebase.jobdispatcher.GooglePlayDriver;
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#Tue Aug 22 15:11:42 CDT 2017
1+
#Thu Feb 14 09:49:29 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
# Make sure to update the version of android-maven-publish if you bump the Gradle version
7-
# See: https://github.com/wupdigital/android-maven-publish
8-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

ktx/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515

1616
}
1717

parse/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ android {
2828
}
2929

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

3434
dependencies {
35-
api "com.android.support:support-annotations:$supportLibVersion"
36-
api "com.android.support:support-compat:$supportLibVersion"
35+
api "androidx.annotation:annotation:1.0.1"
36+
api "androidx.core:core:1.0.1"
3737
api 'com.parse.bolts:bolts-tasks:1.4.0'
3838
api "com.squareup.okhttp3:okhttp:$okhttpVersion"
3939

parse/src/main/java/com/parse/Parse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import android.content.Context;
1212
import android.content.pm.PackageManager;
1313
import android.content.pm.ResolveInfo;
14-
import android.support.annotation.NonNull;
14+
import androidx.annotation.NonNull;
1515
import android.util.Log;
1616

1717
import java.io.File;

parse/src/main/java/com/parse/ParseHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.Nullable;
11+
import androidx.annotation.Nullable;
1212

1313
import com.parse.http.ParseHttpBody;
1414
import com.parse.http.ParseHttpRequest;

parse/src/main/java/com/parse/ParseJSONUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import org.json.JSONException;
1414
import org.json.JSONObject;

parse/src/main/java/com/parse/ParseObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import android.os.Bundle;
1212
import android.os.Parcel;
1313
import android.os.Parcelable;
14-
import android.support.annotation.NonNull;
15-
import android.support.annotation.Nullable;
14+
import androidx.annotation.NonNull;
15+
import androidx.annotation.Nullable;
1616

1717
import org.json.JSONArray;
1818
import org.json.JSONException;

parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import android.net.Uri;
2222
import android.os.Build;
2323
import android.os.Bundle;
24-
import android.support.annotation.Nullable;
25-
import android.support.v4.app.NotificationCompat;
24+
import androidx.annotation.Nullable;
25+
import androidx.core.app.NotificationCompat;
2626

2727
import org.json.JSONException;
2828
import org.json.JSONObject;

parse/src/main/java/com/parse/ParseQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import org.json.JSONException;
1414
import org.json.JSONObject;

parse/src/main/java/com/parse/ParseRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import com.parse.http.ParseHttpBody;
1414
import com.parse.http.ParseHttpRequest;

parse/src/main/java/com/parse/ParseRole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import java.util.regex.Pattern;
1414

parse/src/main/java/com/parse/ParseUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import android.os.Bundle;
1212
import android.os.Parcel;
13-
import android.support.annotation.NonNull;
13+
import androidx.annotation.NonNull;
1414

1515
import org.json.JSONObject;
1616

parse/src/main/java/com/parse/PushHistory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import org.json.JSONException;
1414
import org.json.JSONObject;

parse/src/test/java/com/parse/OfflineQueryLogicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import org.json.JSONArray;
1414
import org.json.JSONObject;

parse/src/test/java/com/parse/ParseQueryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package com.parse;
1010

11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
import org.junit.After;
1414
import org.junit.Before;

0 commit comments

Comments
 (0)