Skip to content

Commit 4297b7b

Browse files
bopbibopbi
committed
update gradle settings
1 parent 5cf1292 commit 4297b7b

File tree

8 files changed

+439
-309
lines changed

8 files changed

+439
-309
lines changed

Diff for: ‎.idea/gradle.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.idea/workspace.xml

+373-278
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Android-Parallax-ListView-Item.iml

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
413
<exclude-output />
514
<content url="file://$MODULE_DIR$">
615
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

Diff for: ‎app/app.iml

+44-18
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,53 +23,78 @@
2223
</facet>
2324
</component>
2425
<component name="NewModuleRootManager" inherit-compiler-output="false">
25-
<output url="file://$MODULE_DIR$/build/classes/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2627
<exclude-output />
2728
<content url="file://$MODULE_DIR$">
28-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
29-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3841
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3942
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4044
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4245
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4649
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4751
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5760
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5861
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
5962
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
6063
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
61-
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
6264
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
6365
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/dex" />
6467
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
6587
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
6688
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/ndk" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/pre-dexed" />
6792
<excludeFolder url="file://$MODULE_DIR$/build/res" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/rs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/source" />
6895
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
7096
</content>
71-
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
97+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
7298
<orderEntry type="sourceFolder" forTests="false" />
7399
</component>
74100
</module>

Diff for: ‎app/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
apply plugin: 'android'
1+
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion "19.0.3"
4+
compileSdkVersion 21
5+
buildToolsVersion '21.0.0'
66

77
defaultConfig {
8-
packageName "com.arjunalabs.parallaxlistviewitem.app"
8+
applicationId "com.arjunalabs.parallaxlistviewitem.app"
99
minSdkVersion 14
10-
targetSdkVersion 19
10+
targetSdkVersion 21
1111
versionCode 1
1212
versionName "1.0"
1313
}
1414
buildTypes {
1515
release {
16-
runProguard false
16+
minifyEnabled false
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}

Diff for: ‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.10.+'
8+
classpath 'com.android.tools.build:gradle:1.0.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Tue Dec 23 23:01:05 WIB 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 commit comments

Comments
 (0)