Skip to content

Commit d51170f

Browse files
committed
Step#1: upgrade Gradle / remove Bintray
1 parent 2ae76fd commit d51170f

File tree

7 files changed

+176
-155
lines changed

7 files changed

+176
-155
lines changed

.github/workflows/ci-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Release to Bintray
2020
uses: eskatos/gradle-command-action@v1
2121
with:
22-
gradle-version: 6.5
23-
arguments: test bintrayUpload
22+
gradle-version: 7.5
23+
arguments: test bintrayUpload # FIXME!!
2424
env:
2525
BINTRAY_USER: ${{secrets.BINTRAY_USER}}
2626
BINTRAY_KEY: ${{secrets.BINTRAY_KEY}}

.github/workflows/ci-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
java-version: 11
1818
- uses: eskatos/gradle-command-action@v1
1919
with:
20-
gradle-version: 6.5
20+
gradle-version: 7.4
2121
arguments: assemble publish -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}}
2222
- name: Create Snapshot Release in Github
2323
uses: actions/create-release@latest

build.gradle.kts

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ val logbackVersion = "1.2.3"
55
val integrationOption = "tests.integration"
66

77
group = "io.reactiverse"
8-
version = "1.0.0"
8+
version = "1.1.0"
99

1010
plugins {
1111
`java-library`
1212
`maven-publish`
13+
signing
1314
jacoco
14-
id("com.jfrog.bintray") version "1.8.5"
15-
id("com.jaredsburrows.license") version "0.8.42"
16-
id("org.sonarqube") version "3.0"
17-
id("com.github.ben-manes.versions") version "0.34.0"
15+
id("org.sonarqube") version "3.3"
16+
id("com.github.ben-manes.versions") version "0.42.0"
1817
}
1918

2019
// In order to publish SNAPSHOTs to Sonatype Snapshots repository => the CI should define such `ossrhUsername` and `ossrhPassword` properties
@@ -27,26 +26,7 @@ if (!project.hasProperty("ossrhPassword")) {
2726
project.extra["ossrhPassword"] = "bar"
2827
}
2928

30-
// Releases are published to Bintray under the Reactiverse organization
31-
// Then manually synced to Central
32-
bintray {
33-
user = System.getenv("BINTRAY_USER")
34-
key = System.getenv("BINTRAY_KEY")
35-
with(pkg) {
36-
userOrg = "reactiverse"
37-
repo = "releases"
38-
name = project.name
39-
setLicenses("Apache-2.0")
40-
vcsUrl = "https://github.com/reactiverse/aws-sdk"
41-
setLabels("vertx", "vert.x", "aws-sdk", "amazon web services")
42-
publicDownloadNumbers = true
43-
with(version) {
44-
name = project.version.toString()
45-
description = "${project.description}. Version: ${project.version}"
46-
}
47-
setPublications("mavenJava")
48-
}
49-
}
29+
extra["isReleaseVersion"] = !version.toString().endsWith("SNAPSHOT")
5030

5131
repositories {
5232
mavenCentral()
@@ -81,7 +61,7 @@ java {
8161
}
8262

8363
jacoco {
84-
toolVersion = "0.8.5"
64+
toolVersion = "0.8.7"
8565
}
8666

8767
tasks {
@@ -94,9 +74,9 @@ tasks {
9474
jacocoTestReport {
9575
dependsOn(":test")
9676
reports {
97-
xml.isEnabled = true
98-
csv.isEnabled = false
99-
html.destination = file("$buildDir/jacocoHtml")
77+
xml.required.set(true)
78+
csv.required.set(false)
79+
html.outputLocation.set(file("$buildDir/jacocoHtml"))
10080
}
10181
}
10282

@@ -141,8 +121,12 @@ tasks {
141121
)
142122
}
143123

124+
withType<Sign> {
125+
onlyIf { project.extra["isReleaseVersion"] as Boolean }
126+
}
127+
144128
withType<Wrapper> {
145-
gradleVersion = "6.5"
129+
gradleVersion = "7.4"
146130
}
147131
}
148132

gradle/wrapper/gradle-wrapper.jar

1.1 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)