Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version number - fix recent issue; move version property to gradle.properties #156

Merged
merged 2 commits into from
Sep 27, 2018
Merged

Version number - fix recent issue; move version property to gradle.properties #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22faa1
fix issue introduced with recent PR - finalzie static class
PeterPitterling Sep 27, 2018
d093827
move version property from build.gradle to gradle.properties file
PeterPitterling Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apply plugin: 'checkstyle'

group = 'com.github.vlsi.ksar'
archivesBaseName = 'ksar'
version = '5.2.4-SNAPSHOT'


sourceCompatibility = '1.8'
targetCompatibility = '1.8'
Expand All @@ -33,11 +33,7 @@ dependencies {
}

task writeVersion << {
def s = version.find(/^\d.\d.\d/)
if (s == null) {
throw new InvalidUserDataException('Invalid version format')
}
new File("build/resources/main/kSar.version").text = s
new File("build/resources/main/kSar.version").text = version
}
classes.dependsOn(writeVersion)

Expand Down
6 changes: 6 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# Copyright 2018 The kSAR Project. All rights reserved.
# See the LICENSE file in the project root for more information.
#

version = 5.2.4-SNAPSHOT
28 changes: 12 additions & 16 deletions src/main/java/net/atomique/ksar/VersionNumber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,27 @@
import java.io.InputStream;
import java.io.InputStreamReader;

public class VersionNumber {
public final class VersionNumber {

private static final Logger log = LoggerFactory.getLogger(VersionNumber.class);

private VersionNumber() {
static {

StringBuilder tmpstr = new StringBuilder();
BufferedReader reader = null;
try {
InputStream is = this.getClass().getResourceAsStream("/kSar.version");
InputStreamReader isr = new InputStreamReader(is);
reader = new BufferedReader(isr);
String line = "";

InputStream is = VersionNumber.class.getClassLoader().getResourceAsStream("kSar.version");
try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {

String line;
while ((line = reader.readLine()) != null) {
tmpstr.append(line);
}
reader.close();

version_string = tmpstr.toString();

} catch (IOException ex) {
log.error("Unable to read Current version", ex);
return;
log.error("Unable to read ksar version", ex);
}
setVersionNumber(tmpstr.toString());
}

private static void setVersionNumber(String version) {
version_string = version;
}

public static String getVersionString() {
Expand Down