Skip to content

Commit 65f4c7f

Browse files
committed
added SemVer version nudging
1 parent 5123b75 commit 65f4c7f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.io.IOException;
88
import java.util.HashMap;
99
import java.util.List;
10+
import java.util.regex.Pattern;
1011

1112
import javax.xml.parsers.DocumentBuilder;
1213
import javax.xml.parsers.DocumentBuilderFactory;
@@ -231,6 +232,15 @@ public void execute(TaskSourceCopy t)
231232
exec.jvmArgs(getServerJvmArgs(getExtension()));
232233
exec.jvmArgs(getServerRunArgs(getExtension()));
233234
}
235+
236+
// complain about version number
237+
// blame cazzar if this regex doesnt work
238+
Pattern pattern = Pattern.compile("(?:(?:mc)?((?:\\d+)(?:.\\d+)+)-)?((?:0|[1-9][0-9]*)(?:\\.(?:0|[1-9][0-9]*))+)(?:-([\\da-z\\-]+(?:\\.[\\da-z\\-]+)*))?(?:\\+([\\da-z\\-]+(?:\\.[\\da-z\\-]+)*))?", Pattern.CASE_INSENSITIVE);
239+
if (!pattern.matcher(project.getVersion().toString()).matches())
240+
{
241+
project.getLogger().warn("Version string '"+project.getVersion()+"' does not match SemVer specification ");
242+
project.getLogger().warn("You should try SemVer : http://semver.org/");
243+
}
234244
}
235245

236246
protected abstract void applyUserPlugin();

src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ private void setForgeVersionJson()
128128
try
129129
{
130130
getExtension().forgeJson = JsonFactory.GSON.fromJson(getWithEtag(url, jsonCache, etagFile), ForgeVersion.class);
131-
132131
}
133132
catch(NullPointerException e)
134133
{

0 commit comments

Comments
 (0)