Skip to content

Commit

Permalink
Normalize url keys
Browse files Browse the repository at this point in the history
  • Loading branch information
LexManos committed Jan 1, 2024
1 parent 440e415 commit a00a58e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 26 deletions.
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,13 @@

# Ignore Gradle build output directory
build
.idea
.idea

#eclipse
**/bin
.settings
.classpath
*.project

#Tests
/repo/
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import net.minecraftforge.gradleutils.PomUtils

plugins {
id 'net.minecraftforge.gradleutils'
id 'java-library'
id 'maven-publish'
id 'org.cadixdev.licenser' version '0.6.1'
id 'net.minecraftforge.licenser' version '1.0.1'
id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
}

group = 'net.minecraftforge'
version = gradleutils.getTagOffsetVersion()
version = gradleutils.tagOffsetVersion
println "Version: $version"

subprojects { Project subproject ->

subproject.apply {
plugin 'java-library'
plugin 'maven-publish'
plugin 'org.cadixdev.licenser'
plugin 'net.minecraftforge.licenser'
}

subproject.group = 'net.minecraftforge'
Expand Down Expand Up @@ -100,12 +100,12 @@ subprojects { Project subproject ->
}

repositories {
maven gradleutils.getPublishingForgeMaven()
maven gradleutils.publishingForgeMaven
}
}

}

changelog {
fromTag '0.3'
from '0.3'
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,7 @@ private PathFileSystem newFileSystemInternal(final String key, final Path path)
}

private String makeKey(URI uri) {
final String keyValue = uri.getRawSchemeSpecificPart();
if (keyValue.startsWith("//"))
return keyValue.substring(2);

return keyValue;
return uri.normalize().getRawSchemeSpecificPart();
}

private String makeKey(Path path) {
Expand Down
14 changes: 0 additions & 14 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven {
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
}
}

plugins {
id 'net.minecraftforge.gradleutils' version '2.+'
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
}
Expand Down

0 comments on commit a00a58e

Please sign in to comment.