Skip to content

Repackage dependencies #153

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

Merged
merged 3 commits into from
Jul 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,21 @@
branches:
only:
- master
- /^\d+\.\d+\.\d+$/ # regex
- /^v4-\d+\.\d+\.\d+$/ # regex

language: android
sudo: false

jdk:
- oraclejdk8
android:
components:
- tools
- platform-tools
- build-tools-25.0.2
- android-25
- android-22
- extra-android-support
- extra-android-m2repository

- sys-img-armeabi-v7a-android-22

before_script:
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"

script:
- ./gradlew clean connectedCheck
- ./gradlew clean build

cache:
directories:
- $HOME/.gradle
- $HOME/.m2/repository

deploy:
provider: script
script: ./gradlew bintrayUpload
skip_cleanup: true
on:
branch: master
tags: true
- $HOME/.m2/repository
29 changes: 0 additions & 29 deletions CONTRIBUTING.md

This file was deleted.

25 changes: 13 additions & 12 deletions ParseLoginSampleBasic/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
apply plugin: 'android'

dependencies {
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
compile rootProject.ext.facebookSDK
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
}
lintOptions {
abortOnError false
}
}

dependencies {
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
implementation project(':login')
implementation rootProject.ext.androidSupport
implementation rootProject.ext.parse
implementation rootProject.ext.parseFacebookUtils
implementation rootProject.ext.parseTwitterUtils
}
44 changes: 16 additions & 28 deletions ParseLoginSampleBasic/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2014, Parse, LLC. All rights reserved.
~
~ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
Expand All @@ -19,16 +18,10 @@
~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.parse.loginsample.basic"
android:versionCode="1"
android:versionName="1.0">
package="com.parse.loginsample.basic">

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="21"/>

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<application
android:name=".SampleApplication"
Expand All @@ -41,33 +34,28 @@
android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.parse.ui.ParseLoginActivity"
android:name="com.parse.ui.login.ParseLoginActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="com.parse.ui.ParseLoginActivity.PARSE_LOGIN_ENABLED"
android:value="true"/>
android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_ENABLED"
android:value="true" />
<meta-data
android:name="com.parse.ui.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME"
android:value="true"/>
android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME"
android:value="true" />
<meta-data
android:name="com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED"
android:value="true"/>
android:name="com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED"
android:value="true" />
<meta-data
android:name="com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
android:value="true"/>
android:name="com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
android:value="true" />
</activity>
<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:label="@string/app_name" />

<meta-data
android:name="com.parse.APPLICATION_ID"
Expand All @@ -77,7 +65,7 @@
android:value="@string/parse_client_key" />
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>
android:value="@string/facebook_app_id" />
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,25 @@
import android.app.Application;

import com.parse.Parse;
import com.parse.ParseFacebookUtils;
import com.parse.ParseTwitterUtils;
import com.parse.facebook.ParseFacebookUtils;
import com.parse.twitter.ParseTwitterUtils;

public class SampleApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
// Required - Initialize the Parse SDK
Parse.initialize(this);
@Override
public void onCreate() {
super.onCreate();
// Required - Initialize the Parse SDK
Parse.Configuration configuration = new Parse.Configuration.Builder(this)
.build();
Parse.initialize(configuration);

Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);

ParseFacebookUtils.initialize(this);
ParseFacebookUtils.initialize(this);

// Optional - If you don't want to allow Twitter login, you can
// remove this line (and other related ParseTwitterUtils calls)
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
getString(R.string.twitter_consumer_secret));
}
// Optional - If you don't want to allow Twitter login, you can
// remove this line (and other related ParseTwitterUtils calls)
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
getString(R.string.twitter_consumer_secret));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import android.widget.TextView;

import com.parse.ParseUser;
import com.parse.ui.ParseLoginBuilder;
import com.parse.ui.login.ParseLoginBuilder;

/**
* Shows the user profile. This simple activity can function regardless of whether the user
Expand Down
25 changes: 13 additions & 12 deletions ParseLoginSampleCodeCustomization/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
apply plugin: 'android'

dependencies {
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
compile rootProject.ext.facebookSDK
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
}
lintOptions {
abortOnError false
}
}

dependencies {
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
implementation project(':login')
implementation rootProject.ext.androidSupport
implementation rootProject.ext.parse
implementation rootProject.ext.parseFacebookUtils
implementation rootProject.ext.parseTwitterUtils
}
33 changes: 11 additions & 22 deletions ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2014, Parse, LLC. All rights reserved.
~
~ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
Expand All @@ -19,16 +18,12 @@
~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.parse.loginsample.codecustomization"
android:versionCode="1"
android:versionName="1.0">
package="com.parse.loginsample.codecustomization"
android:versionCode="1"
android:versionName="1.0">

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="21"/>

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<application
android:name=".SampleApplication"
Expand All @@ -41,21 +36,15 @@
android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.parse.ui.ParseLoginActivity"
android:name="com.parse.ui.login.ParseLoginActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
</activity>
<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:label="@string/app_name" />
android:launchMode="singleTop"></activity>

<meta-data
android:name="com.parse.APPLICATION_ID"
Expand All @@ -65,7 +54,7 @@
android:value="@string/parse_client_key" />
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>
android:value="@string/facebook_app_id" />
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,25 @@
import android.app.Application;

import com.parse.Parse;
import com.parse.ParseFacebookUtils;
import com.parse.ParseTwitterUtils;
import com.parse.facebook.ParseFacebookUtils;
import com.parse.twitter.ParseTwitterUtils;

public class SampleApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
// Required - Initialize the Parse SDK
Parse.initialize(this);
@Override
public void onCreate() {
super.onCreate();
// Required - Initialize the Parse SDK
Parse.Configuration configuration = new Parse.Configuration.Builder(this)
.build();
Parse.initialize(configuration);

Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);

ParseFacebookUtils.initialize(this);
ParseFacebookUtils.initialize(this);

// Optional - If you don't want to allow Twitter login, you can
// remove this line (and other related ParseTwitterUtils calls)
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
getString(R.string.twitter_consumer_secret));
}
// Optional - If you don't want to allow Twitter login, you can
// remove this line (and other related ParseTwitterUtils calls)
ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
getString(R.string.twitter_consumer_secret));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import android.widget.TextView;

import com.parse.ParseUser;
import com.parse.ui.ParseLoginBuilder;
import com.parse.ui.login.ParseLoginBuilder;

import java.util.Arrays;

Expand Down
Loading