Skip to content

Commit 60ac62d

Browse files
committed
Merge pull request #21 from ParsePlatform/update_latest_sdks_dec_2014
Update for Android Studio 1.0, better documentation
2 parents 311f62c + 231e09b commit 60ac62d

34 files changed

+184
-158
lines changed

LICENSE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Copyright (c) 2014, Facebook, Inc. All rights reserved.
1+
Copyright (c) 2014, Parse, LLC. All rights reserved.
22

33
You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
44
copy, modify, and distribute this software in source code or binary form for use
5-
in connection with the web services and APIs provided by Facebook.
5+
in connection with the web services and APIs provided by Parse.
66

7-
As with any software that integrates with the Facebook platform, your use of
8-
this software is subject to the Facebook Developer Principles and Policies
9-
[http://developers.facebook.com/policy/]. This copyright notice shall be
7+
As with any software that integrates with the Parse platform, your use of
8+
this software is subject to the Parse Terms of Service
9+
[https://www.parse.com/about/terms]. This copyright notice shall be
1010
included in all copies or substantial portions of the software.
1111

1212
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

ParseLoginSampleBasic/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:versionName="1.0">
55

66
<uses-sdk
7-
android:minSdkVersion="8"
8-
android:targetSdkVersion="19"/>
7+
android:minSdkVersion="9"
8+
android:targetSdkVersion="21"/>
99

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

ParseLoginSampleBasic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.0'
4+
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
77
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*
2-
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
2+
* Copyright (c) 2014, Parse, LLC. All rights reserved.
33
*
44
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
55
* copy, modify, and distribute this software in source code or binary form for use
6-
* in connection with the web services and APIs provided by Facebook.
6+
* in connection with the web services and APIs provided by Parse.
77
*
8-
* As with any software that integrates with the Facebook platform, your use of
9-
* this software is subject to the Facebook Developer Principles and Policies
10-
* [http://developers.facebook.com/policy/]. This copyright notice shall be
8+
* As with any software that integrates with the Parse platform, your use of
9+
* this software is subject to the Parse Terms of Service
10+
* [https://www.parse.com/about/terms]. This copyright notice shall be
1111
* included in all copies or substantial portions of the software.
1212
*
1313
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*
2-
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
2+
* Copyright (c) 2014, Parse, LLC. All rights reserved.
33
*
44
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
55
* copy, modify, and distribute this software in source code or binary form for use
6-
* in connection with the web services and APIs provided by Facebook.
6+
* in connection with the web services and APIs provided by Parse.
77
*
8-
* As with any software that integrates with the Facebook platform, your use of
9-
* this software is subject to the Facebook Developer Principles and Policies
10-
* [http://developers.facebook.com/policy/]. This copyright notice shall be
8+
* As with any software that integrates with the Parse platform, your use of
9+
* this software is subject to the Parse Terms of Service
10+
* [https://www.parse.com/about/terms]. This copyright notice shall be
1111
* included in all copies or substantial portions of the software.
1212
*
1313
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

ParseLoginSampleCodeCustomization/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:versionName="1.0">
55

66
<uses-sdk
7-
android:minSdkVersion="8"
8-
android:targetSdkVersion="19"/>
7+
android:minSdkVersion="9"
8+
android:targetSdkVersion="21"/>
99

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

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.0'
4+
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
77
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*
2-
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
2+
* Copyright (c) 2014, Parse, LLC. All rights reserved.
33
*
44
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
55
* copy, modify, and distribute this software in source code or binary form for use
6-
* in connection with the web services and APIs provided by Facebook.
6+
* in connection with the web services and APIs provided by Parse.
77
*
8-
* As with any software that integrates with the Facebook platform, your use of
9-
* this software is subject to the Facebook Developer Principles and Policies
10-
* [http://developers.facebook.com/policy/]. This copyright notice shall be
8+
* As with any software that integrates with the Parse platform, your use of
9+
* this software is subject to the Parse Terms of Service
10+
* [https://www.parse.com/about/terms]. This copyright notice shall be
1111
* included in all copies or substantial portions of the software.
1212
*
1313
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*
2-
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
2+
* Copyright (c) 2014, Parse, LLC. All rights reserved.
33
*
44
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
55
* copy, modify, and distribute this software in source code or binary form for use
6-
* in connection with the web services and APIs provided by Facebook.
6+
* in connection with the web services and APIs provided by Parse.
77
*
8-
* As with any software that integrates with the Facebook platform, your use of
9-
* this software is subject to the Facebook Developer Principles and Policies
10-
* [http://developers.facebook.com/policy/]. This copyright notice shall be
8+
* As with any software that integrates with the Parse platform, your use of
9+
* this software is subject to the Parse Terms of Service
10+
* [https://www.parse.com/about/terms]. This copyright notice shall be
1111
* included in all copies or substantial portions of the software.
1212
*
1313
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

ParseLoginSampleLayoutOverride/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:versionName="1.0">
55

66
<uses-sdk
7-
android:minSdkVersion="8"
8-
android:targetSdkVersion="19"/>
7+
android:minSdkVersion="9"
8+
android:targetSdkVersion="21"/>
99

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

0 commit comments

Comments
 (0)