Skip to content

Commit 40add28

Browse files
committed
try templating off RxAndroid
1 parent 2da017a commit 40add28

1 file changed

Lines changed: 37 additions & 17 deletions

File tree

build.gradle

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717
group = "io.reactivex.rxjava2"
1818
ext.githubProjectName = "RxJavaFX"
1919

20-
version = "2.11.0-RC9"
20+
version = "2.11.0-RC10"
2121

2222
/*
2323
def releaseTag = System.getenv("TRAVIS_TAG");
@@ -111,18 +111,6 @@ publishing {
111111
}
112112
}
113113

114-
// Reactive-Streams as compile dependency
115-
publishing.publications.all {
116-
pom.withXml {
117-
asNode().dependencies."*".findAll() {
118-
it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep ->
119-
dep.name == it.artifactId.text()
120-
}
121-
}.each { it.scope*.value = "compile"}
122-
}
123-
}
124-
125-
126114

127115
if (rootProject.hasProperty("releaseMode")) {
128116

@@ -152,24 +140,23 @@ if (rootProject.hasProperty("releaseMode")) {
152140

153141
if ("full".equals(rootProject.releaseMode)) {
154142
// based on https://github.com/bintray/gradle-bintray-plugin
155-
def rver = version;
156143

157-
println("ReleaseMode: " + rootProject.releaseMode + " version " + rver);
144+
println("ReleaseMode: " + rootProject.releaseMode + " version " + version);
158145

159146
bintray {
160147
user = rootProject.bintrayUser
161148
key = rootProject.bintrayKey
162149
publications = ["mavenJava"]
163150
publish = true
164151
pkg {
165-
repo = "RxJava/io/reactivex/rxjava2/rxjavafx"
152+
repo = "RxJavaFX"
166153
name = "RxJavaFX"
167154
userOrg = "reactivex"
168155
labels = ["rxjava", "reactivex"]
169156
licenses = ["Apache-2.0"]
170157
vcsUrl = "https://github.com/ReactiveX/RxJavaFX.git"
171158
version {
172-
name = rver
159+
name = version
173160
gpg {
174161
sign = true
175162
}
@@ -186,3 +173,36 @@ if (rootProject.hasProperty("releaseMode")) {
186173
build.finalizedBy(bintrayUpload)
187174
}
188175
}
176+
177+
178+
179+
180+
181+
bintray {
182+
configurations = ['archives']
183+
184+
publish = true
185+
186+
pkg {
187+
repo = 'RxJava'
188+
name = 'RxJavaFX'
189+
userOrg = 'reactivex'
190+
licenses = ['Apache-2.0']
191+
labels = ['rxjava', 'reactivex']
192+
websiteUrl = 'https://github.com/ReactiveX/RxJavaFX/'
193+
issueTrackerUrl = 'https://github.com/ReactiveX/RxJavaFX/issues'
194+
vcsUrl = "https://github.com/ReactiveX/RxJavaFX.git"
195+
}
196+
}
197+
198+
if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
199+
bintray.user = project.bintrayUser
200+
bintray.key = project.bintrayKey
201+
}
202+
203+
if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
204+
def sync = bintray.pkg.version.mavenCentralSync
205+
sync.sync = true
206+
sync.user = project.sonatypeUsername
207+
sync.password = project.sonatypePassword
208+
}

0 commit comments

Comments
 (0)