Skip to content

Commit aa1f2aa

Browse files
committed
Merge pull request ReactiveX#46 from quidryan/apply-plugin-everywhere
Apply plugin everywhere
2 parents f281f09 + c215482 commit aa1f2aa

39 files changed

+53
-348
lines changed

build.gradle

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
buildscript {
2-
repositories { jcenter() }
3-
dependencies {
4-
classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+'
5-
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
6-
}
2+
repositories { jcenter() }
3+
dependencies {
4+
classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+'
5+
}
6+
configurations.classpath.resolutionStrategy {
7+
// The above dependency will bring in guava, which then pollutes child projects
8+
force 'com.google.guava:guava:15.0'
9+
}
10+
711
}
12+
13+
apply plugin: 'rxjava-project'

gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
rxJavaVersion=1.0.0-rc.9
2-
version=0.22.0

library/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ buildscript {
77
}
88

99
apply plugin: 'rxjava-project'
10+
11+
// Multi-module modules aren't really supported
12+
version = rootProject.version
13+
1014
apply plugin: 'provided-base'
1115

1216
dependencies {
@@ -29,3 +33,4 @@ test {
2933
displayGranularity 2
3034
}
3135
}
36+

sample-app/build.gradle

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
buildscript {
2+
repositories { jcenter() }
3+
dependencies {
4+
classpath 'com.android.tools.build:gradle:0.12.+' // 0.12.x is for Gradle 1.12 projects
5+
}
6+
}
7+
8+
repositories {
9+
jcenter()
10+
}
11+
12+
apply plugin: 'com.android.application'
13+
14+
android {
15+
compileSdkVersion 20
16+
buildToolsVersion "20"
17+
18+
defaultConfig {
19+
minSdkVersion 14
20+
targetSdkVersion 20
21+
versionCode 1
22+
versionName "1.0"
23+
}
24+
buildTypes {
25+
release {
26+
runProguard false
27+
}
28+
}
29+
}
30+
31+
dependencies {
32+
compile project(':rxandroid')
33+
}

samples-build-wrapper/build.gradle

-14
This file was deleted.

samples/app/build.gradle

-30
This file was deleted.

samples/build.gradle

-17
This file was deleted.

samples/gradle.properties

-18
This file was deleted.
-49.4 KB
Binary file not shown.

samples/gradle/wrapper/gradle-wrapper.properties

-6
This file was deleted.

samples/gradlew

-164
This file was deleted.

0 commit comments

Comments
 (0)