Skip to content

Commit 1916d06

Browse files
committed
Merge pull request #56 from ParsePlatform/wangmengyan.change_to_gradle_project_structure
Change to gradle project structure
2 parents fc96b10 + 9efd3e7 commit 1916d06

File tree

88 files changed

+103
-129
lines changed

Some content is hidden

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

88 files changed

+103
-129
lines changed

ParseLoginSampleBasic/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,4 @@ android {
1818
minSdkVersion rootProject.ext.minSdkVersion
1919
targetSdkVersion rootProject.ext.targetSdkVersion
2020
}
21-
22-
sourceSets {
23-
main {
24-
manifest.srcFile 'AndroidManifest.xml'
25-
java.srcDirs = ['src']
26-
res.srcDirs = ['res']
27-
}
28-
}
2921
}

ParseLoginSampleBasic/project.properties

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

ParseLoginSampleBasic/AndroidManifest.xml renamed to ParseLoginSampleBasic/src/main/AndroidManifest.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (c) 2014, Parse, LLC. All rights reserved.
4+
~
5+
~ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
6+
~ copy, modify, and distribute this software in source code or binary form for use
7+
~ in connection with the web services and APIs provided by Parse.
8+
~
9+
~ As with any software that integrates with the Parse platform, your use of
10+
~ this software is subject to the Parse Terms of Service
11+
~ [https://www.parse.com/about/terms]. This copyright notice shall be
12+
~ included in all copies or substantial portions of the software.
13+
~
14+
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
16+
~ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
17+
~ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
18+
~ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19+
~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20+
-->
121
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
222
package="com.parse.loginsample.basic"
323
android:versionCode="1"

0 commit comments

Comments
 (0)