From 0da6feab1ee33b1fe01193f08f8c2cde77cd67cb Mon Sep 17 00:00:00 2001 From: Benjamin Boyle Date: Thu, 6 May 2021 15:34:41 -0700 Subject: [PATCH 1/2] Move Gradle properties into gradle.properties file Moved version, group, and description into gradle.properties file. Removed POM_ARTIFACT property as the 'name' property in the settings file is used when building the POM. Removed 'release.scope' property as it does not appear to be used. Removed VERSION_NAME property and references to it, in favor of 'version' property. --- build.gradle | 8 ++------ gradle.properties | 7 +++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d39a630675..9e67c70c58 100644 --- a/build.gradle +++ b/build.gradle @@ -27,15 +27,11 @@ if (releaseTag != null && !releaseTag.isEmpty()) { if (releaseTag.startsWith("v")) { releaseTag = releaseTag.substring(1) } - project.setProperty("VERSION_NAME" , releaseTag) + project.version = releaseTag - logger.info("Releasing with version: {}", version) + logger.lifecycle("Releasing with version: " + project.version) } -group = "io.reactivex.rxjava3" -version = project.properties["VERSION_NAME"] -description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM." - repositories { mavenCentral() } diff --git a/gradle.properties b/gradle.properties index 8da73143fa..c5c9fdbebc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,7 @@ -release.scope=patch -VERSION_NAME=3.0.0-SNAPSHOT +group=io.reactivex.rxjava3 +version=3.0.0-SNAPSHOT +description=RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM. -GROUP=io.reactivex.rxjava3 -POM_ARTIFACT_ID=rxjava POM_NAME=RxJava POM_PACKAGING=jar From b00718f7e62f4cabae052627d11ec2a144a7b1fa Mon Sep 17 00:00:00 2001 From: Benjamin Boyle Date: Thu, 6 May 2021 22:01:47 -0700 Subject: [PATCH 2/2] Replace POM_ARTIFACT_ID in gradle.properties Added POM_ARTIFACT_ID=rxjava in gradle.properties file --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index c5c9fdbebc..e685b8103a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,7 @@ group=io.reactivex.rxjava3 version=3.0.0-SNAPSHOT description=RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM. +POM_ARTIFACT_ID=rxjava POM_NAME=RxJava POM_PACKAGING=jar