Skip to content

Commit 8183aee

Browse files
authored
Merge pull request #160 from parse-community/androidx
Androidx
2 parents bf5191b + a94d00f commit 8183aee

File tree

14 files changed

+24
-24
lines changed

14 files changed

+24
-24
lines changed

.travis.yml

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

1111
before_install:
1212
- mkdir "$ANDROID_HOME/licenses" || true
13-
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
13+
- echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
1414

1515
script:
1616
- ./gradlew clean build
1717

1818
cache:
1919
directories:
2020
- $HOME/.gradle
21-
- $HOME/.m2/repository
21+
- $HOME/.m2/repository

ParseLoginSampleBasic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
1717
implementation project(':login')
18-
implementation rootProject.ext.androidSupport
18+
implementation "androidx.appcompat:appcompat:1.0.2"
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
1717
implementation project(':login')
18-
implementation rootProject.ext.androidSupport
18+
implementation "androidx.appcompat:appcompat:1.0.2"
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

ParseLoginSampleLayoutOverride/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
1717
implementation project(':login')
18-
implementation rootProject.ext.androidSupport
18+
implementation "androidx.appcompat:appcompat:1.0.2"
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

ParseLoginSampleWithDispatchActivity/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
1717
implementation project(':login')
18-
implementation rootProject.ext.androidSupport
18+
implementation "androidx.appcompat:appcompat:1.0.2"
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

ParseUI-Widget-Sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ android {
1616
}
1717

1818
dependencies {
19-
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
19+
implementation "androidx.appcompat:appcompat:1.0.2"
2020
implementation project(':widget')
2121
}

ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.parse.ui.widget.sample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
public class MainActivity extends AppCompatActivity {
77

ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MyApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public void onCreate() {
1111
super.onCreate();
1212

1313
Parse.Configuration configuration = new Parse.Configuration.Builder(this)
14+
.server("http://localhost")
1415
.build();
1516
Parse.initialize(configuration);
1617
}

build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.1.3'
7+
classpath 'com.android.tools.build:gradle:3.3.2'
88
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
99
}
1010
}
@@ -18,15 +18,12 @@ allprojects {
1818
}
1919

2020
ext {
21-
compileSdkVersion = 27
21+
compileSdkVersion = 28
2222

2323
minSdkVersion = 15
24-
targetSdkVersion = 27
24+
targetSdkVersion = 28
2525

26-
supportLibVersion = "27.1.1"
27-
androidSupport = "com.android.support:support-v4:${supportLibVersion}"
28-
29-
parse = "com.github.parse-community.Parse-SDK-Android:parse:1.18.0"
30-
parseFacebookUtils = 'com.github.parse-community:ParseFacebookUtils-Android:1.12.0'
31-
parseTwitterUtils = 'com.github.parse-community:ParseTwitterUtils-Android:1.12.0'
26+
parse = "com.github.parse-community.Parse-SDK-Android:parse:1.19.0"
27+
parseFacebookUtils = 'com.github.parse-community:ParseFacebookUtils-Android:1.13.0'
28+
parseTwitterUtils = 'com.github.parse-community:ParseTwitterUtils-Android:1.13.0'
3229
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 18 10:59:11 CDT 2018
1+
#Fri Mar 08 09:51:04 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

login/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
}
3636

3737
dependencies {
38-
api "com.android.support:appcompat-v7:$supportLibVersion"
38+
api "androidx.appcompat:appcompat:1.0.2"
3939
api rootProject.ext.parse
4040

4141
compileOnly rootProject.ext.parseFacebookUtils

login/src/main/java/com/parse/ui/login/ParseLoginActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import android.content.pm.PackageManager.NameNotFoundException;
3030
import android.os.Build;
3131
import android.os.Bundle;
32-
import android.support.v4.app.FragmentTransaction;
33-
import android.support.v7.app.AppCompatActivity;
32+
import androidx.fragment.app.FragmentTransaction;
33+
import androidx.appcompat.app.AppCompatActivity;
3434
import android.util.Log;
3535
import android.view.Window;
3636

login/src/main/java/com/parse/ui/login/ParseLoginFragmentBase.java

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

2424
import android.annotation.TargetApi;
2525
import android.os.Build;
26-
import android.support.v4.app.Fragment;
27-
import android.support.v4.app.FragmentActivity;
26+
import androidx.fragment.app.Fragment;
27+
import androidx.fragment.app.FragmentActivity;
2828
import android.util.Log;
2929
import android.widget.Toast;
3030

0 commit comments

Comments
 (0)