From 3f049d05235d2e77e9c2ecf71e920e52bef9f4b8 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Sun, 16 Jan 2022 14:20:27 +0100 Subject: [PATCH] Require Java 11 --- BlueMapAPI | 2 +- BlueMapCommon/build.gradle.kts | 2 +- BlueMapCore/build.gradle.kts | 2 +- implementations/cli/build.gradle.kts | 2 +- implementations/fabric-1.15.2/build.gradle.kts | 6 +++++- implementations/fabric-1.16.1/build.gradle.kts | 6 +++++- implementations/fabric-1.16.2/build.gradle.kts | 6 +++++- implementations/fabric-1.17/build.gradle.kts | 4 ++++ implementations/fabric-1.18/build.gradle.kts | 4 ++++ implementations/spigot/build.gradle.kts | 2 +- 10 files changed, 28 insertions(+), 8 deletions(-) diff --git a/BlueMapAPI b/BlueMapAPI index 30bde97b..93c227b5 160000 --- a/BlueMapAPI +++ b/BlueMapAPI @@ -1 +1 @@ -Subproject commit 30bde97bd9700ff412ab73911eb56b76c879b503 +Subproject commit 93c227b5cc8903aafb9091b552682ffc5ba51e3c diff --git a/BlueMapCommon/build.gradle.kts b/BlueMapCommon/build.gradle.kts index cf190bad..06a656ad 100644 --- a/BlueMapCommon/build.gradle.kts +++ b/BlueMapCommon/build.gradle.kts @@ -19,7 +19,7 @@ releaseProperties.load(file("../release.properties").inputStream()) group = "de.bluecolored.bluemap.common" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/BlueMapCore/build.gradle.kts b/BlueMapCore/build.gradle.kts index 0fd4e249..11da3203 100644 --- a/BlueMapCore/build.gradle.kts +++ b/BlueMapCore/build.gradle.kts @@ -16,7 +16,7 @@ releaseProperties.load(file("../release.properties").inputStream()) group = "de.bluecolored.bluemap.core" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/implementations/cli/build.gradle.kts b/implementations/cli/build.gradle.kts index 7a953f86..ab692e18 100644 --- a/implementations/cli/build.gradle.kts +++ b/implementations/cli/build.gradle.kts @@ -18,7 +18,7 @@ releaseProperties.load(file("../../release.properties").inputStream()) group = "de.bluecolored.bluemap.cli" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/implementations/fabric-1.15.2/build.gradle.kts b/implementations/fabric-1.15.2/build.gradle.kts index 4d818ee6..11137a88 100644 --- a/implementations/fabric-1.15.2/build.gradle.kts +++ b/implementations/fabric-1.15.2/build.gradle.kts @@ -20,7 +20,7 @@ releaseProperties.load(file("../../release.properties").inputStream()) group = "de.bluecolored.bluemap.fabric" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) @@ -39,6 +39,9 @@ repositories { maven { setUrl("https://maven.fabricmc.net/") } + maven { + setUrl("https://oss.sonatype.org/content/repositories/snapshots") + } } val shadowInclude: Configuration by configurations.creating @@ -61,6 +64,7 @@ dependencies { mappings ("net.fabricmc:yarn:1.15.2+build.17:v2") modImplementation ("net.fabricmc:fabric-loader:0.9.2+build.206") modImplementation ("net.fabricmc.fabric-api:fabric-api:0.19.0+build.325-1.15") + modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/implementations/fabric-1.16.1/build.gradle.kts b/implementations/fabric-1.16.1/build.gradle.kts index 6e1a8a0e..daa378db 100644 --- a/implementations/fabric-1.16.1/build.gradle.kts +++ b/implementations/fabric-1.16.1/build.gradle.kts @@ -20,7 +20,7 @@ releaseProperties.load(file("../../release.properties").inputStream()) group = "de.bluecolored.bluemap.fabric" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) @@ -39,6 +39,9 @@ repositories { maven { setUrl("https://maven.fabricmc.net/") } + maven { + setUrl("https://oss.sonatype.org/content/repositories/snapshots") + } } val shadowInclude: Configuration by configurations.creating @@ -61,6 +64,7 @@ dependencies { mappings ("net.fabricmc:yarn:1.16.1+build.21:v2") modImplementation ("net.fabricmc:fabric-loader:0.9.2+build.206") modImplementation ("net.fabricmc.fabric-api:fabric-api:0.16.2+build.385-1.16.1") + modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/implementations/fabric-1.16.2/build.gradle.kts b/implementations/fabric-1.16.2/build.gradle.kts index a480e826..e00f5f9d 100644 --- a/implementations/fabric-1.16.2/build.gradle.kts +++ b/implementations/fabric-1.16.2/build.gradle.kts @@ -20,7 +20,7 @@ releaseProperties.load(file("../../release.properties").inputStream()) group = "de.bluecolored.bluemap.fabric" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) @@ -39,6 +39,9 @@ repositories { maven { setUrl("https://maven.fabricmc.net/") } + maven { + setUrl("https://oss.sonatype.org/content/repositories/snapshots") + } } val shadowInclude: Configuration by configurations.creating @@ -61,6 +64,7 @@ dependencies { mappings ("net.fabricmc:yarn:1.16.3+build.1:v2") modImplementation ("net.fabricmc:fabric-loader:0.9.3+build.207") modImplementation ("net.fabricmc.fabric-api:fabric-api:0.20.2+build.402-1.16") + modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/implementations/fabric-1.17/build.gradle.kts b/implementations/fabric-1.17/build.gradle.kts index 6eb1a091..cd44e0e4 100644 --- a/implementations/fabric-1.17/build.gradle.kts +++ b/implementations/fabric-1.17/build.gradle.kts @@ -39,6 +39,9 @@ repositories { maven { setUrl("https://maven.fabricmc.net/") } + maven { + setUrl("https://oss.sonatype.org/content/repositories/snapshots") + } } val shadowInclude: Configuration by configurations.creating @@ -61,6 +64,7 @@ dependencies { mappings ("net.fabricmc:yarn:1.17+build.1:v2") modImplementation ("net.fabricmc:fabric-loader:0.11.3") modImplementation ("net.fabricmc.fabric-api:fabric-api:0.34.9+1.17") + modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/implementations/fabric-1.18/build.gradle.kts b/implementations/fabric-1.18/build.gradle.kts index bb1afb12..20e89a8f 100644 --- a/implementations/fabric-1.18/build.gradle.kts +++ b/implementations/fabric-1.18/build.gradle.kts @@ -39,6 +39,9 @@ repositories { maven { setUrl("https://maven.fabricmc.net/") } + maven { + setUrl("https://oss.sonatype.org/content/repositories/snapshots") + } } val shadowInclude: Configuration by configurations.creating @@ -61,6 +64,7 @@ dependencies { mappings ("net.fabricmc:yarn:1.18-pre5+build.4:v2") modImplementation ("net.fabricmc:fabric-loader:0.11.3") modImplementation ("net.fabricmc.fabric-api:fabric-api:0.42.2+1.18") + modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/implementations/spigot/build.gradle.kts b/implementations/spigot/build.gradle.kts index 00395288..7c0b4c52 100644 --- a/implementations/spigot/build.gradle.kts +++ b/implementations/spigot/build.gradle.kts @@ -18,7 +18,7 @@ releaseProperties.load(file("../../release.properties").inputStream()) group = "de.bluecolored.bluemap.bukkit" version = releaseProperties["version"].toString() -val javaTarget = 8 +val javaTarget = 11 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget)