Skip to content

Commit aa3dfa1

Browse files
committed
Update
1 parent 357584a commit aa3dfa1

5 files changed

Lines changed: 35 additions & 5 deletions

File tree

src/main/java/org/mangorage/mangobotgradle/tasks/DatagenTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.mangorage.mangobotgradle.MangoBotGradlePlugin;
3232
import org.mangorage.mangobotgradle.core.resolvers.ResolveDependency;
3333
import org.mangorage.mangobotgradle.core.resolvers.Resolver;
34-
import org.mangorage.mangobotgradle.types.Dependencies;
35-
import org.mangorage.mangobotgradle.types.Dependency;
34+
import org.mangorage.mangobotgradle.util.Dependencies;
35+
import org.mangorage.mangobotgradle.util.Dependency;
3636

3737
import java.io.BufferedWriter;
3838
import java.io.FileWriter;

src/main/java/org/mangorage/mangobotgradle/tasks/ReleaseTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public ReleaseTask(Config config, String group, Version.Type type) {
4343

4444
@TaskAction
4545
public void run() {
46-
Version version = new Version(Path.of("version.txt"));
46+
Version version = new Version(Path.of("commits.txt"));
4747
switch (type) {
4848
case MAJOR -> version.bumpMajor();
4949
case MINOR -> version.bumpMinor();

src/main/java/org/mangorage/mangobotgradle/types/Dependencies.java renamed to src/main/java/org/mangorage/mangobotgradle/util/Dependencies.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mangorage.mangobotgradle.types;
1+
package org.mangorage.mangobotgradle.util;
22

33

44
import java.util.List;

src/main/java/org/mangorage/mangobotgradle/types/Dependency.java renamed to src/main/java/org/mangorage/mangobotgradle/util/Dependency.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
* OR OTHER DEALINGS IN THE SOFTWARE.
2121
*/
2222

23-
package org.mangorage.mangobotgradle.types;
23+
package org.mangorage.mangobotgradle.util;
2424

2525
public record Dependency(String url, String group, String artifact, String version, String target) {}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package org.mangorage.mangobotgradle.util;
2+
3+
import java.io.BufferedReader;
4+
import java.io.IOException;
5+
import java.io.InputStreamReader;
6+
7+
public record GitVersion(String tag, String commits, String commit) {
8+
private static final GitVersion UNKNOWN = new GitVersion("0.0", "9999", "unknown");
9+
10+
public static GitVersion getGitVersion() {
11+
try {
12+
var process = Runtime.getRuntime().exec("git describe --long --tags");
13+
try (var isr = new InputStreamReader(process.getInputStream())) {
14+
try (var br = new BufferedReader(isr)) {
15+
var result = br.readLine().split("-");
16+
return new GitVersion(
17+
result[0],
18+
result[1],
19+
result[2]
20+
);
21+
}
22+
}
23+
} catch (IOException ignored) {}
24+
return UNKNOWN;
25+
}
26+
27+
public boolean isUnknown() {
28+
return this == UNKNOWN;
29+
}
30+
}

0 commit comments

Comments
 (0)