Skip to content

Commit 974e197

Browse files
Thomas NieldThomas Nield
authored andcommitted
try reconfiguring build scripts
1 parent 7a68dfc commit 974e197

2 files changed

Lines changed: 59 additions & 19 deletions

File tree

build.gradle

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
buildscript {
2-
repositories { jcenter() }
3-
repositories { mavenCentral() }
2+
repositories {
3+
jcenter()
4+
mavenCentral()
5+
maven {
6+
url "https://plugins.gradle.org/m2/"
7+
}
8+
}
49

510
dependencies {
611
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
@@ -9,7 +14,8 @@ buildscript {
914
}
1015

1116

12-
group = 'io.reactivex.rxjava2'
17+
group = "io.reactivex.rxjava2"
18+
ext.githubProjectName = "rxjavafx"
1319

1420
version = project.properties["release.version"]
1521

@@ -24,10 +30,17 @@ if (releaseTag != null && !releaseTag.isEmpty()) {
2430
println("Releasing with version " + version);
2531
}
2632

27-
apply plugin: 'java'
33+
34+
apply plugin: "java"
35+
apply plugin: "maven"
2836
apply plugin: "com.jfrog.bintray"
2937
apply plugin: "com.jfrog.artifactory"
3038

39+
40+
sourceCompatibility = JavaVersion.VERSION_11
41+
targetCompatibility = JavaVersion.VERSION_11
42+
43+
3144
def currentOS = org.gradle.internal.os.OperatingSystem.current()
3245
def platform
3346
if (currentOS.isWindows()) {
@@ -38,7 +51,9 @@ if (currentOS.isWindows()) {
3851
platform = 'mac'
3952
}
4053

41-
repositories { jcenter() }
54+
repositories {
55+
mavenCentral()
56+
}
4257

4358
dependencies {
4459
compile 'io.reactivex.rxjava2:rxjava:2.2.2'
@@ -51,13 +66,31 @@ dependencies {
5166

5267

5368

69+
task sourcesJar(type: Jar, dependsOn: classes) {
70+
classifier = "sources"
71+
from sourceSets.main.allSource
72+
}
73+
74+
task javadocJar(type: Jar, dependsOn: javadoc) {
75+
classifier = "javadoc"
76+
from javadoc.destinationDir
77+
}
78+
79+
artifacts {
80+
archives jar
81+
archives sourcesJar
82+
archives javadocJar
83+
}
84+
85+
86+
5487
apply plugin: "maven-publish"
5588

5689
install {
5790
repositories.mavenInstaller.pom.project {
58-
name "RxJava"
59-
description "Reactive Extensions for Java"
60-
url "https://github.com/ReactiveX/RxJava"
91+
name "RxJavaFX"
92+
description "RxJava Extensions for JavaFX"
93+
url "https://github.com/ReactiveX/RxJavaFX"
6194
licenses {
6295
license {
6396
name "The Apache Software License, Version 2.0"
@@ -67,19 +100,19 @@ install {
67100
}
68101
developers {
69102
developer {
70-
id "akarnokd"
71-
name "David Karnok"
72-
email "akarnokd@gmail.com"
103+
id "thomasnield"
104+
name "Thomas Nield"
105+
email "thomasnield@live.com"
73106
}
74107
}
75108
scm {
76-
connection "scm:git:git@github.com:ReactiveX/RxJava.git"
77-
url "scm:git:git@github.com:ReactiveX/RxJava.git"
78-
developerConnection "scm:git:git@github.com:ReactiveX/RxJava.git"
109+
connection "scm:git:git@github.com:ReactiveX/RxJavaFX.git"
110+
url "scm:git:git@github.com:ReactiveX/RxJavaFX.git"
111+
developerConnection "scm:git:git@github.com:ReactiveX/RxJavaFX.git"
79112
}
80113
issueManagement {
81114
system "github"
82-
url "https://github.com/ReactiveX/RxJava/issues"
115+
url "https://github.com/ReactiveX/RxJavaFX/issues"
83116
}
84117
}
85118
}
@@ -146,12 +179,12 @@ if (rootProject.hasProperty("releaseMode")) {
146179
configurations = ["archives"]
147180
publish = true
148181
pkg {
149-
repo = "RxJava"
150-
name = "RxJava"
182+
repo = "RxJavaFX"
183+
name = "RxJavaFX"
151184
userOrg = "reactivex"
152-
labels = ["rxjava", "reactivex"]
185+
labels = ["rxjavafx", "reactivex"]
153186
licenses = ["Apache-2.0"]
154-
vcsUrl = "https://github.com/ReactiveX/RxJava.git"
187+
vcsUrl = "https://github.com/ReactiveX/RxJavaFX.git"
155188
version {
156189
name = rver
157190
gpg {

buildViaTravis.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
#!/bin/bash
3+
# This script will build the project.
4+
5+
buildTag="$TRAVIS_TAG"
6+
7+
export GRADLE_OPTS=-Xmx1024m
8+
29
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
310
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
411
./gradlew -PreleaseMode=pr build

0 commit comments

Comments
 (0)