From 9d92b8c41fe0738af40662e9710e5dabb0fc56e3 Mon Sep 17 00:00:00 2001 From: Nicklas Lundin Date: Fri, 29 Nov 2024 16:33:42 +0100 Subject: [PATCH] refactor: hard coded version string updated by release-please --- release-please-config.json | 3 ++- .../java/com/spotify/confidence/ConfidenceUtils.java | 12 +++--------- sdk-java/src/main/resources/version.properties | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 sdk-java/src/main/resources/version.properties diff --git a/release-please-config.json b/release-please-config.json index 2049c05e..20a3e578 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -13,7 +13,8 @@ "pom.xml", "README.md", "openfeature-provider/pom.xml", - "sdk-java/pom.xml" + "sdk-java/pom.xml", + "sdk-java/src/main/java/com/spotify/confidence/ConfidenceUtils.java" ], "changelog-sections": [ { diff --git a/sdk-java/src/main/java/com/spotify/confidence/ConfidenceUtils.java b/sdk-java/src/main/java/com/spotify/confidence/ConfidenceUtils.java index a480c411..375c89e9 100644 --- a/sdk-java/src/main/java/com/spotify/confidence/ConfidenceUtils.java +++ b/sdk-java/src/main/java/com/spotify/confidence/ConfidenceUtils.java @@ -3,13 +3,13 @@ import com.spotify.confidence.ConfidenceValue.Struct; import com.spotify.confidence.Exceptions.IllegalValuePath; import com.spotify.confidence.Exceptions.ValueNotFound; -import java.io.IOException; import java.util.Arrays; import java.util.List; -import java.util.Properties; import java.util.regex.Pattern; import org.slf4j.Logger; +// Be careful if you intend moving this file. The version returned by `getSdkVersion()` is set by +// Release Please by defining its path as an "extra file" in release-please-config.json final class ConfidenceUtils { private ConfidenceUtils() {} @@ -85,12 +85,6 @@ public static FlagPath getPath(String str) throws IllegalValuePath { } static String getSdkVersion() { - try { - final Properties prop = new Properties(); - prop.load(ConfidenceUtils.class.getResourceAsStream("/version.properties")); - return prop.getProperty("version"); - } catch (IOException e) { - throw new RuntimeException("Can't determine version of the SDK", e); - } + return "0.1.3-SNAPSHOT"; // x-release-please-version } } diff --git a/sdk-java/src/main/resources/version.properties b/sdk-java/src/main/resources/version.properties deleted file mode 100644 index 713c9158..00000000 --- a/sdk-java/src/main/resources/version.properties +++ /dev/null @@ -1 +0,0 @@ -version = ${project.version} \ No newline at end of file