Skip to content

Commit 4d06add

Browse files
author
Kaushik Gopal
committed
chore: upgradle gradle for Android Studio 1.0 updat
1 parent f3579c3 commit 4d06add

5 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎Android-RxJava.iml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
</configuration>
88
</facet>
99
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
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" />
1113
<exclude-output />
1214
<content url="file://$MODULE_DIR$">
1315
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎app/app.iml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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" />
1616
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3333
<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" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3839
<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" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -77,22 +79,23 @@
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8083
</content>
81-
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
84+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8285
<orderEntry type="sourceFolder" forTests="false" />
83-
<orderEntry type="library" exported="" name="timber-2.2.2" level="project" />
8486
<orderEntry type="library" exported="" name="okhttp-urlconnection-2.0.0" level="project" />
85-
<orderEntry type="library" exported="" name="support-v13-20.0.0" level="project" />
8687
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
88+
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
8789
<orderEntry type="library" exported="" name="okio-1.0.0" level="project" />
88-
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
90+
<orderEntry type="library" exported="" name="timber-2.4.2" level="project" />
91+
<orderEntry type="library" exported="" name="support-v13-21.0.2" level="project" />
8992
<orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
93+
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
9094
<orderEntry type="library" exported="" name="guava-17.0" level="project" />
9195
<orderEntry type="library" exported="" name="butterknife-5.1.1" level="project" />
92-
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
93-
<orderEntry type="library" exported="" name="rxjava-core-0.20.4" level="project" />
96+
<orderEntry type="library" exported="" name="rxandroid-0.22.0" level="project" />
9497
<orderEntry type="library" exported="" name="okhttp-2.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="rxjava-android-0.20.4" level="project" />
98+
<orderEntry type="library" exported="" name="rxjava-1.0.0-rc.6" level="project" />
9699
</component>
97100
</module>
98101

‎app/build.gradle‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile 'com.android.support:support-v13:20.0.+'
4+
compile 'com.android.support:support-v13:21.0.2'
55

66
compile 'com.google.guava:guava:17.+'
77

88
compile 'com.jakewharton:butterknife:5.1.1'
9-
compile 'com.jakewharton.timber:timber:2.2.2'
10-
compile 'com.netflix.rxjava:rxjava-android:0.20.4'
9+
compile 'com.jakewharton.timber:timber:2.4.2'
10+
compile 'io.reactivex:rxandroid:0.22.0'
11+
//compile 'io.reactivex:rxjava-math:0.21.0'
1112

1213
compile 'com.squareup.retrofit:retrofit:1.6.1'
1314
compile 'com.squareup.okhttp:okhttp:2.0.0'
@@ -16,19 +17,19 @@ dependencies {
1617
}
1718

1819
android {
19-
compileSdkVersion 19
20-
buildToolsVersion '19.1.0'
20+
compileSdkVersion 21
21+
buildToolsVersion '21.1.2'
2122

2223
defaultConfig {
2324
applicationId "com.morihacky.android.rxjava"
2425
minSdkVersion 14
25-
targetSdkVersion 19
26+
targetSdkVersion 21
2627
versionCode 1
2728
versionName "1.0"
2829
}
2930
buildTypes {
3031
release {
31-
runProguard false
32+
minifyEnabled true
3233
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3334
}
3435
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:0.12.+'
9+
classpath 'com.android.tools.build:gradle:1.0.0'
1010

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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Wed Dec 24 12:27:06 PST 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.12-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 commit comments

Comments
 (0)