Skip to content

Commit 38c1dc5

Browse files
balysvbalysv
committed
Update build tools
1 parent ba5ea46 commit 38c1dc5

File tree

9 files changed

+51
-128
lines changed

9 files changed

+51
-128
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
/local.properties
66
/.idea/workspace.xml
77
.DS_Store
8+
/build
9+
*.iml

‎demo/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
*.iml

‎demo/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1+
apply plugin: 'com.android.application'
2+
13
buildscript {
24
repositories {
35
mavenCentral()
46
}
57
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.7.+'
8+
classpath 'com.android.tools.build:gradle:0.12.+'
79
}
810
}
9-
apply plugin: 'android'
1011

1112
repositories {
1213
mavenCentral()
1314
}
1415

1516
android {
1617
compileSdkVersion 19
17-
buildToolsVersion "19.0.0"
18+
buildToolsVersion "20.0.0"
1819

1920
defaultConfig {
2021
minSdkVersion 9
@@ -23,6 +24,6 @@ android {
2324
}
2425

2526
dependencies {
26-
compile 'com.android.support:appcompat-v7:+'
27+
compile 'com.android.support:appcompat-v7:19.1.0'
2728
compile project(':library')
2829
}

‎demo/demo.iml‎

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

‎gradle/wrapper/gradle-wrapper.jar‎

840 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 07 12:01:45 EET 2014
1+
#Thu Jul 10 16:58:11 EEST 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.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip

‎library/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
*.iml

‎library/build.gradle‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.7.+'
6+
classpath 'com.android.tools.build:gradle:0.12.+'
77
}
88
}
9-
apply plugin: 'android-library'
9+
apply plugin: 'com.android.library'
1010

1111
repositories {
1212
mavenCentral()
1313
}
1414

1515
android {
1616
compileSdkVersion 19
17-
buildToolsVersion '19.0.0'
17+
buildToolsVersion '20.0.0'
1818

1919
defaultConfig {
2020
minSdkVersion 9
@@ -25,14 +25,9 @@ android {
2525
sourceCompatibility JavaVersion.VERSION_1_7
2626
targetCompatibility JavaVersion.VERSION_1_7
2727
}
28-
release {
29-
runProguard false
30-
proguardFile 'proguard-rules.txt'
31-
proguardFile getDefaultProguardFile('proguard-android.txt')
32-
}
3328
}
3429

3530
dependencies {
36-
compile 'com.android.support:appcompat-v7:+'
31+
compile 'com.android.support:appcompat-v7:19.1.0'
3732
compile 'com.nineoldandroids:library:2.4.0'
3833
}

‎library/library.iml‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ExpandableButtonMenu" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6-
<option name="SELECTED_BUILD_VARIANT" value="Debug" />
7-
<option name="ASSEMBLE_TASK_NAME" value="bundleDebug" />
8-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebug" />
9-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" />
6+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1010
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1111
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1212
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,57 +23,60 @@
2323
</facet>
2424
</component>
2525
<component name="NewModuleRootManager" inherit-compiler-output="false">
26-
<output url="file://$MODULE_DIR$/build/classes/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2727
<exclude-output />
2828
<content url="file://$MODULE_DIR$">
29-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/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/source/buildConfig/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" 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/source/r/test/debug" isTestSource="true" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4244
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4345
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4850
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
4951
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5052
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
60-
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
61-
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6260
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
6361
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
6462
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
6564
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
6666
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/lint" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/ndk" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
6870
<excludeFolder url="file://$MODULE_DIR$/build/res" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/rs" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/source" />
7073
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
7174
</content>
7275
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
7376
<orderEntry type="sourceFolder" forTests="false" />
74-
<orderEntry type="library" exported="" name="support-v4-19.0.0" level="project" />
77+
<orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
78+
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
7579
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
76-
<orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71900.aar" level="project" />
7780
</component>
7881
</module>
7982

0 commit comments

Comments
 (0)