feat: upgrade to 1.18!

oddlama · Dec 3, 2021 · a2366a9 · a2366a9
1 parent 5d93c16
commit a2366a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ subprojects {
 	apply(plugin = "com.diffplug.spotless")
 
 	group = "org.oddlama.vane"
-	version = "1.3.2"
+	version = "1.4.0"
 
 	repositories() {
 		mavenCentral()
@@ -43,7 +43,7 @@ subprojects {
 			importOrder("java", "javax", "com", "net", "org", "")
 			removeUnusedImports()
 			trimTrailingWhitespace()
-			prettier(mapOf("prettier" to "2.5.0", "prettier-plugin-java" to "1.6.0")).config(mapOf("parser" to "java", "printWidth" to 120, "tabWidth" to 4))
+			prettier(mapOf("prettier" to "2.5.0", "prettier-plugin-java" to "1.6.0")).config(mapOf("parser" to "java", "printWidth" to 120, "tabWidth" to 4, "useTabs" to true))
 		}
 	}
 }
@@ -68,7 +68,7 @@ configure(subprojects.filter {
     !listOf("vane-annotations", "vane-waterfall").contains(it.name)
 }) {
 	tasks.create<Copy>("copyJar") {
-		from("jar")
+		from(tasks.reobfJar)
 		into("${project.rootProject.projectDir}/target")
 	}
 

diff --git a/sign_and_zip.sh b/sign_and_zip.sh
@@ -6,13 +6,13 @@ die() {
 }
 
 echo "[+] Signing jar files"
-for i in target-obf/*.jar; do
+for i in target/*.jar; do
 	gpg --local-user 680AA614E988DE3E84E0DEFA503F6C0684104B0A --armor --detach-sign --sign "$i" \
 		|| die "Could not sign jar file"
 done
 
 echo "[+] Creating all-plugins.zip"
-cd target-obf \
-    || die "Could not cd into target-obf/"
+cd target \
+    || die "Could not cd into target/"
 zip -r all-plugins.zip vane*.jar -x "vane*waterfall*.jar" \
     || die "Could not create all-plugins.zip"
diff --git a/vane-core/build.gradle.kts b/vane-core/build.gradle.kts
@@ -21,10 +21,4 @@ tasks {
 		relocate("org.reflections", "org.oddlama.vane.external.reflections")
 		relocate("org.json", "org.oddlama.vane.external.json")
 	}
-
-	copyJar {
-		from("shadowJar")
-		duplicatesStrategy = DuplicatesStrategy.INCLUDE
-		rename("(.*)-all.jar", "$1.jar")
-	}
 }
diff --git a/vane-waterfall/build.gradle.kts b/vane-waterfall/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
 }
 
 tasks.create<Copy>("copyJar") {
-	from("shadowJar")
+	from(tasks.shadowJar)
 	into("${project.rootProject.projectDir}/target")
 	duplicatesStrategy = DuplicatesStrategy.INCLUDE
 	rename("(.*)-all.jar", "$1.jar")