Skip to content

Commit 6c8e8a5

Browse files
PaintNinjaPaintNinja
authored
Add a module name, relocate root package from jver to java_version (#3)
1 parent 8474645 commit 6c8e8a5

File tree

18 files changed

+57
-53
lines changed

18 files changed

+57
-53
lines changed

‎build.gradle‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'java-library'
35
id 'idea'
@@ -59,17 +61,19 @@ java {
5961
withSourcesJar()
6062
}
6163

62-
shadowJar {
63-
ext.reloc = 'net.minecraftforge.jver.reloc.'
64+
tasks.named('shadowJar', ShadowJar) {
65+
final String reloc = 'net.minecraftforge.java_version.reloc.'
6466
relocate 'joptsimple', reloc + 'jopt'
6567
relocate 'com.google.gson', reloc + 'gson'
6668
relocate 'org.kamranzafar.jtar', reloc + 'jtar'
6769
}
6870

69-
jar {
71+
tasks.named('jar', Jar) {
7072
manifest {
7173
attributes([
72-
'Main-Class': 'net.minecraftforge.jver.Main'
74+
'Main-Class': 'net.minecraftforge.java_version.Main',
75+
'Automatic-Module-Name': 'net.minecraftforge.java_version',
76+
'Sealed': true
7377
] as LinkedHashMap)
7478
attributes([
7579
'Specification-Title': 'Java Version',
@@ -78,12 +82,12 @@ jar {
7882
'Implementation-Title': 'Java Version',
7983
'Implementation-Vendor': 'Forge Development LLC',
8084
'Implementation-Version': project.version
81-
] as LinkedHashMap, 'net/minecraftforge/jver/')
85+
] as LinkedHashMap, 'net/minecraftforge/java_version/')
8286
}
8387
from(createJavaProbeClass.outputFile)
8488
}
8589

86-
compileJava {
90+
tasks.named('compileJava', JavaCompile) {
8791
dependsOn javaProbeJar
8892
options.encoding = 'UTF-8'
8993
}

‎buildSrc/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ license {
1414

1515
dependencies {
1616
implementation gradleApi()
17-
implementation 'org.ow2.asm:asm:9.7'
18-
implementation 'org.ow2.asm:asm-tree:9.7'
19-
implementation 'org.ow2.asm:asm-util:9.7'
17+
implementation 'org.ow2.asm:asm:9.7.1'
18+
implementation 'org.ow2.asm:asm-tree:9.7.1'
19+
implementation 'org.ow2.asm:asm-util:9.7.1'
2020
}

‎settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
}
66

77
plugins {
8-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
8+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
99
}
1010

1111
dependencyResolutionManagement {
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
1616
library('jtar', 'org.kamranzafar:jtar:2.3')
1717

1818
// Used by probe to generate a Java 1 compatible class file
19-
version('asm', '9.7')
19+
version('asm', '9.7.1')
2020
library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm')
2121
library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
2222
library('asm-tree', 'org.ow2.asm', 'asm-tree' ).versionRef('asm')

src/main/java/net/minecraftforge/jver/Disco.java renamed to src/main/java/net/minecraftforge/java_version/Disco.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.BufferedWriter;
88
import java.io.ByteArrayInputStream;
@@ -41,10 +41,10 @@
4141
import com.google.gson.reflect.TypeToken;
4242
import com.google.gson.stream.JsonReader;
4343

44-
import net.minecraftforge.jver.util.DownloadUtils;
45-
import net.minecraftforge.jver.util.HashFunction;
46-
import net.minecraftforge.jver.util.OS;
47-
import net.minecraftforge.jver.util.ProcessUtils;
44+
import net.minecraftforge.java_version.util.DownloadUtils;
45+
import net.minecraftforge.java_version.util.HashFunction;
46+
import net.minecraftforge.java_version.util.OS;
47+
import net.minecraftforge.java_version.util.ProcessUtils;
4848

4949
/**
5050
* A client for the <a href="https://github.com/foojayio/discoapi">foojay disco API</a>

src/main/java/net/minecraftforge/jver/DiscoLocator.java renamed to src/main/java/net/minecraftforge/java_version/DiscoLocator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.File;
88
import java.util.ArrayList;
99
import java.util.Collections;
1010
import java.util.List;
1111

12-
import net.minecraftforge.jver.Disco.Arch;
13-
import net.minecraftforge.jver.api.IJavaInstall;
14-
import net.minecraftforge.jver.util.OS;
12+
import net.minecraftforge.java_version.Disco.Arch;
13+
import net.minecraftforge.java_version.api.IJavaInstall;
14+
import net.minecraftforge.java_version.util.OS;
1515

1616
/**
1717
* Locates java installs that have been downloaded from the <a href="https://github.com/foojayio/discoapi">disco API</a>

src/main/java/net/minecraftforge/jver/DiscoMain.java renamed to src/main/java/net/minecraftforge/java_version/DiscoMain.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.File;
88
import java.util.Arrays;
@@ -12,8 +12,8 @@
1212
import joptsimple.OptionSet;
1313
import joptsimple.OptionSpec;
1414
import joptsimple.util.EnumConverter;
15-
import net.minecraftforge.jver.util.OS;
16-
import net.minecraftforge.jver.util.ProcessUtils;
15+
import net.minecraftforge.java_version.util.OS;
16+
import net.minecraftforge.java_version.util.ProcessUtils;
1717

1818
public class DiscoMain {
1919
public static void main(String[] args) throws Exception {

src/main/java/net/minecraftforge/jver/GradleLocator.java renamed to src/main/java/net/minecraftforge/java_version/GradleLocator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.File;
88
import java.io.IOException;
@@ -11,8 +11,8 @@
1111
import java.util.List;
1212
import java.util.regex.Pattern;
1313

14-
import net.minecraftforge.jver.api.IJavaInstall;
15-
import net.minecraftforge.jver.util.OS;
14+
import net.minecraftforge.java_version.api.IJavaInstall;
15+
import net.minecraftforge.java_version.util.OS;
1616

1717
/*
1818
* Attempts to find the java install using various tools that Gradle uses

src/main/java/net/minecraftforge/jver/JavaHomeLocator.java renamed to src/main/java/net/minecraftforge/java_version/JavaHomeLocator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.File;
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
import net.minecraftforge.jver.api.IJavaInstall;
12-
import net.minecraftforge.jver.api.IJavaLocator;
13-
import net.minecraftforge.jver.util.OS;
14-
import net.minecraftforge.jver.util.ProcessUtils;
11+
import net.minecraftforge.java_version.api.IJavaInstall;
12+
import net.minecraftforge.java_version.api.IJavaLocator;
13+
import net.minecraftforge.java_version.util.OS;
14+
import net.minecraftforge.java_version.util.ProcessUtils;
1515

1616
/*
1717
* Attempts to find the java install using the JAVA_HOME environment variable.

src/main/java/net/minecraftforge/jver/JavaVersion.java renamed to src/main/java/net/minecraftforge/java_version/JavaVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.util.ArrayList;
88
import java.util.List;

src/main/java/net/minecraftforge/jver/Main.java renamed to src/main/java/net/minecraftforge/java_version/Main.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Forge Development LLC and contributors
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*/
5-
package net.minecraftforge.jver;
5+
package net.minecraftforge.java_version;
66

77
import java.io.File;
88
import java.util.ArrayList;
@@ -14,11 +14,11 @@
1414
import joptsimple.OptionParser;
1515
import joptsimple.OptionSet;
1616
import joptsimple.OptionSpec;
17-
import net.minecraftforge.jver.Disco.Arch;
18-
import net.minecraftforge.jver.Disco.Distro;
19-
import net.minecraftforge.jver.api.IJavaInstall;
20-
import net.minecraftforge.jver.api.IJavaLocator;
21-
import net.minecraftforge.jver.util.OS;
17+
import net.minecraftforge.java_version.Disco.Arch;
18+
import net.minecraftforge.java_version.Disco.Distro;
19+
import net.minecraftforge.java_version.api.IJavaInstall;
20+
import net.minecraftforge.java_version.api.IJavaLocator;
21+
import net.minecraftforge.java_version.util.OS;
2222

2323
public class Main {
2424
public static void main(String[] args) throws Exception {

0 commit comments

Comments
 (0)