Skip to content

Commit 6d0e7fa

Browse files
build settings for rxjava-core
1 parent 9c2c93e commit 6d0e7fa

File tree

3 files changed

+12
-31
lines changed

3 files changed

+12
-31
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ Thumbs.db
3939
# Gradle Files #
4040
################
4141
.gradle
42+
.m2
4243

4344
# Build output directies
44-
/target
45-
*/target
46-
/build
47-
*/build
45+
target/
46+
build/
4847

4948
# IntelliJ specific files/directories
5049
out
@@ -59,6 +58,7 @@ atlassian-ide-plugin.xml
5958
.project
6059
.settings
6160
.metadata
61+
bin/
6262

6363
# NetBeans specific files/directories
6464
.nbattrs

build.gradle

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Establish version and status
2-
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
1+
ext.githubProjectName = rootProject.name
32

43
buildscript {
54
repositories { mavenCentral() }
@@ -12,36 +11,18 @@ allprojects {
1211

1312
apply from: file('gradle/convention.gradle')
1413
apply from: file('gradle/maven.gradle')
15-
apply from: file('gradle/check.gradle')
14+
//apply from: file('gradle/check.gradle')
1615
apply from: file('gradle/license.gradle')
1716
apply from: file('gradle/release.gradle')
1817

1918
subprojects {
20-
group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
2119

22-
dependencies {
23-
compile 'javax.ws.rs:jsr311-api:1.1.1'
24-
compile 'com.sun.jersey:jersey-core:1.11'
25-
testCompile 'org.testng:testng:6.1.1'
26-
testCompile 'org.mockito:mockito-core:1.8.5'
27-
}
28-
}
20+
group = "com.netflix.${githubProjectName}"
2921

30-
project(':template-client') {
31-
apply plugin: 'java'
32-
dependencies {
33-
compile 'org.slf4j:slf4j-api:1.6.3'
34-
compile 'com.sun.jersey:jersey-client:1.11'
35-
}
36-
}
22+
sourceSets.test.java.srcDir 'src/main/java'
3723

38-
project(':template-server') {
39-
apply plugin: 'war'
40-
apply plugin: 'jetty'
41-
dependencies {
42-
compile 'com.sun.jersey:jersey-server:1.11'
43-
compile 'com.sun.jersey:jersey-servlet:1.11'
44-
compile project(':template-client')
24+
tasks.withType(Javadoc).each {
25+
it.classpath = sourceSets.main.compileClasspath
4526
}
4627
}
4728

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
rootProject.name='gradle-template-multi' // TEMPLATE: Change this
2-
include 'template-client','template-server'
1+
rootProject.name='rxjava'
2+
include 'rxjava-core'

0 commit comments

Comments
 (0)