Skip to content

Commit 1018b5d

Browse files
JawnnypooJawnnypoo
authored
Merge pull request #153 from Jawnnypoo/master
Repackage dependencies
2 parents f11be29 + 4562789 commit 1018b5d

File tree

86 files changed

+421
-1736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+421
-1736
lines changed

‎.travis.yml

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,21 @@
11
branches:
22
only:
33
- master
4-
- /^\d+\.\d+\.\d+$/ # regex
4+
- /^v4-\d+\.\d+\.\d+$/ # regex
5+
56
language: android
6-
sudo: false
7+
78
jdk:
89
- oraclejdk8
9-
android:
10-
components:
11-
- tools
12-
- platform-tools
13-
- build-tools-25.0.2
14-
- android-25
15-
- android-22
16-
- extra-android-support
17-
- extra-android-m2repository
1810

19-
- sys-img-armeabi-v7a-android-22
20-
21-
before_script:
22-
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
23-
- emulator -avd test -no-skin -no-audio -no-window &
24-
- android-wait-for-emulator
25-
- adb shell input keyevent 82 &
11+
before_install:
12+
- mkdir "$ANDROID_HOME/licenses" || true
13+
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
2614

2715
script:
28-
- ./gradlew clean connectedCheck
16+
- ./gradlew clean build
2917

3018
cache:
3119
directories:
3220
- $HOME/.gradle
33-
- $HOME/.m2/repository
34-
35-
deploy:
36-
provider: script
37-
script: ./gradlew bintrayUpload
38-
skip_cleanup: true
39-
on:
40-
branch: master
41-
tags: true
21+
- $HOME/.m2/repository

‎CONTRIBUTING.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎ParseLoginSampleBasic/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
apply plugin: 'android'
2-
3-
dependencies {
4-
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
5-
compile rootProject.ext.facebookSDK
6-
compile project(':ParseUI-Login')
7-
compile rootProject.ext.androidSupport
8-
compile rootProject.ext.parse
9-
compile rootProject.ext.parseFacebookUtils
10-
compile rootProject.ext.parseTwitterUtils
11-
}
1+
apply plugin: 'com.android.application'
122

133
android {
144
compileSdkVersion rootProject.ext.compileSdkVersion
15-
buildToolsVersion rootProject.ext.buildToolsVersion
165

176
defaultConfig {
187
minSdkVersion rootProject.ext.minSdkVersion
198
targetSdkVersion rootProject.ext.targetSdkVersion
209
}
10+
lintOptions {
11+
abortOnError false
12+
}
13+
}
14+
15+
dependencies {
16+
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17+
implementation project(':login')
18+
implementation rootProject.ext.androidSupport
19+
implementation rootProject.ext.parse
20+
implementation rootProject.ext.parseFacebookUtils
21+
implementation rootProject.ext.parseTwitterUtils
2122
}

‎ParseLoginSampleBasic/src/main/AndroidManifest.xml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright (c) 2014, Parse, LLC. All rights reserved.
43
~
54
~ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -19,16 +18,10 @@
1918
~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2019
-->
2120
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22-
package="com.parse.loginsample.basic"
23-
android:versionCode="1"
24-
android:versionName="1.0">
21+
package="com.parse.loginsample.basic">
2522

26-
<uses-sdk
27-
android:minSdkVersion="9"
28-
android:targetSdkVersion="21"/>
29-
30-
<uses-permission android:name="android.permission.INTERNET"/>
31-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
23+
<uses-permission android:name="android.permission.INTERNET" />
24+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
3225

3326
<application
3427
android:name=".SampleApplication"
@@ -41,33 +34,28 @@
4134
android:label="@string/app_name"
4235
android:launchMode="singleTop">
4336
<intent-filter>
44-
<action android:name="android.intent.action.MAIN"/>
37+
<action android:name="android.intent.action.MAIN" />
4538

46-
<category android:name="android.intent.category.LAUNCHER"/>
39+
<category android:name="android.intent.category.LAUNCHER" />
4740
</intent-filter>
4841
</activity>
4942
<activity
50-
android:name="com.parse.ui.ParseLoginActivity"
43+
android:name="com.parse.ui.login.ParseLoginActivity"
5144
android:label="@string/app_name"
5245
android:launchMode="singleTop">
5346
<meta-data
54-
android:name="com.parse.ui.ParseLoginActivity.PARSE_LOGIN_ENABLED"
55-
android:value="true"/>
47+
android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_ENABLED"
48+
android:value="true" />
5649
<meta-data
57-
android:name="com.parse.ui.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME"
58-
android:value="true"/>
50+
android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME"
51+
android:value="true" />
5952
<meta-data
60-
android:name="com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED"
61-
android:value="true"/>
53+
android:name="com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED"
54+
android:value="true" />
6255
<meta-data
63-
android:name="com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
64-
android:value="true"/>
56+
android:name="com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
57+
android:value="true" />
6558
</activity>
66-
<activity android:name="com.facebook.FacebookActivity"
67-
android:configChanges=
68-
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
69-
android:theme="@android:style/Theme.Translucent.NoTitleBar"
70-
android:label="@string/app_name" />
7159

7260
<meta-data
7361
android:name="com.parse.APPLICATION_ID"
@@ -77,7 +65,7 @@
7765
android:value="@string/parse_client_key" />
7866
<meta-data
7967
android:name="com.facebook.sdk.ApplicationId"
80-
android:value="@string/facebook_app_id"/>
68+
android:value="@string/facebook_app_id" />
8169
</application>
8270

8371
</manifest>

‎ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleApplication.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,25 @@
2424
import android.app.Application;
2525

2626
import com.parse.Parse;
27-
import com.parse.ParseFacebookUtils;
28-
import com.parse.ParseTwitterUtils;
27+
import com.parse.facebook.ParseFacebookUtils;
28+
import com.parse.twitter.ParseTwitterUtils;
2929

3030
public class SampleApplication extends Application {
31-
@Override
32-
public void onCreate() {
33-
super.onCreate();
34-
// Required - Initialize the Parse SDK
35-
Parse.initialize(this);
31+
@Override
32+
public void onCreate() {
33+
super.onCreate();
34+
// Required - Initialize the Parse SDK
35+
Parse.Configuration configuration = new Parse.Configuration.Builder(this)
36+
.build();
37+
Parse.initialize(configuration);
3638

37-
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
39+
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
3840

39-
ParseFacebookUtils.initialize(this);
41+
ParseFacebookUtils.initialize(this);
4042

41-
// Optional - If you don't want to allow Twitter login, you can
42-
// remove this line (and other related ParseTwitterUtils calls)
43-
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
44-
getString(R.string.twitter_consumer_secret));
45-
}
43+
// Optional - If you don't want to allow Twitter login, you can
44+
// remove this line (and other related ParseTwitterUtils calls)
45+
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
46+
getString(R.string.twitter_consumer_secret));
47+
}
4648
}

‎ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleProfileActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import android.widget.TextView;
3030

3131
import com.parse.ParseUser;
32-
import com.parse.ui.ParseLoginBuilder;
32+
import com.parse.ui.login.ParseLoginBuilder;
3333

3434
/**
3535
* Shows the user profile. This simple activity can function regardless of whether the user

‎ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
apply plugin: 'android'
2-
3-
dependencies {
4-
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
5-
compile rootProject.ext.facebookSDK
6-
compile project(':ParseUI-Login')
7-
compile rootProject.ext.androidSupport
8-
compile rootProject.ext.parse
9-
compile rootProject.ext.parseFacebookUtils
10-
compile rootProject.ext.parseTwitterUtils
11-
}
1+
apply plugin: 'com.android.application'
122

133
android {
144
compileSdkVersion rootProject.ext.compileSdkVersion
15-
buildToolsVersion rootProject.ext.buildToolsVersion
165

176
defaultConfig {
187
minSdkVersion rootProject.ext.minSdkVersion
198
targetSdkVersion rootProject.ext.targetSdkVersion
209
}
10+
lintOptions {
11+
abortOnError false
12+
}
13+
}
14+
15+
dependencies {
16+
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17+
implementation project(':login')
18+
implementation rootProject.ext.androidSupport
19+
implementation rootProject.ext.parse
20+
implementation rootProject.ext.parseFacebookUtils
21+
implementation rootProject.ext.parseTwitterUtils
2122
}

‎ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright (c) 2014, Parse, LLC. All rights reserved.
43
~
54
~ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -19,16 +18,12 @@
1918
~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2019
-->
2120
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22-
package="com.parse.loginsample.codecustomization"
23-
android:versionCode="1"
24-
android:versionName="1.0">
21+
package="com.parse.loginsample.codecustomization"
22+
android:versionCode="1"
23+
android:versionName="1.0">
2524

26-
<uses-sdk
27-
android:minSdkVersion="9"
28-
android:targetSdkVersion="21"/>
29-
30-
<uses-permission android:name="android.permission.INTERNET"/>
31-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
25+
<uses-permission android:name="android.permission.INTERNET" />
26+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
3227

3328
<application
3429
android:name=".SampleApplication"
@@ -41,21 +36,15 @@
4136
android:label="@string/app_name"
4237
android:launchMode="singleTop">
4338
<intent-filter>
44-
<action android:name="android.intent.action.MAIN"/>
39+
<action android:name="android.intent.action.MAIN" />
4540

46-
<category android:name="android.intent.category.LAUNCHER"/>
41+
<category android:name="android.intent.category.LAUNCHER" />
4742
</intent-filter>
4843
</activity>
4944
<activity
50-
android:name="com.parse.ui.ParseLoginActivity"
45+
android:name="com.parse.ui.login.ParseLoginActivity"
5146
android:label="@string/app_name"
52-
android:launchMode="singleTop">
53-
</activity>
54-
<activity android:name="com.facebook.FacebookActivity"
55-
android:configChanges=
56-
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
57-
android:theme="@android:style/Theme.Translucent.NoTitleBar"
58-
android:label="@string/app_name" />
47+
android:launchMode="singleTop"></activity>
5948

6049
<meta-data
6150
android:name="com.parse.APPLICATION_ID"
@@ -65,7 +54,7 @@
6554
android:value="@string/parse_client_key" />
6655
<meta-data
6756
android:name="com.facebook.sdk.ApplicationId"
68-
android:value="@string/facebook_app_id"/>
57+
android:value="@string/facebook_app_id" />
6958
</application>
7059

7160
</manifest>

‎ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleApplication.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,25 @@
2424
import android.app.Application;
2525

2626
import com.parse.Parse;
27-
import com.parse.ParseFacebookUtils;
28-
import com.parse.ParseTwitterUtils;
27+
import com.parse.facebook.ParseFacebookUtils;
28+
import com.parse.twitter.ParseTwitterUtils;
2929

3030
public class SampleApplication extends Application {
31-
@Override
32-
public void onCreate() {
33-
super.onCreate();
34-
// Required - Initialize the Parse SDK
35-
Parse.initialize(this);
31+
@Override
32+
public void onCreate() {
33+
super.onCreate();
34+
// Required - Initialize the Parse SDK
35+
Parse.Configuration configuration = new Parse.Configuration.Builder(this)
36+
.build();
37+
Parse.initialize(configuration);
3638

37-
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
39+
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
3840

39-
ParseFacebookUtils.initialize(this);
41+
ParseFacebookUtils.initialize(this);
4042

41-
// Optional - If you don't want to allow Twitter login, you can
42-
// remove this line (and other related ParseTwitterUtils calls)
43-
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
44-
getString(R.string.twitter_consumer_secret));
45-
}
43+
// Optional - If you don't want to allow Twitter login, you can
44+
// remove this line (and other related ParseTwitterUtils calls)
45+
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
46+
getString(R.string.twitter_consumer_secret));
47+
}
4648
}

‎ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleProfileActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import android.widget.TextView;
3131

3232
import com.parse.ParseUser;
33-
import com.parse.ui.ParseLoginBuilder;
33+
import com.parse.ui.login.ParseLoginBuilder;
3434

3535
import java.util.Arrays;
3636

0 commit comments

Comments
 (0)