From c941b611736ccffe5aed85513430b8346a4e5ec9 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 25 Aug 2020 16:53:42 -0400 Subject: [PATCH] Improve Build System --- examples/javascript/build.gradle.kts | 3 +-- examples/javascript/gradle.properties | 1 - examples/javascript/settings.gradle.kts | 2 ++ examples/typescript/build.gradle.kts | 3 +-- examples/typescript/gradle.properties | 1 - examples/typescript/settings.gradle.kts | 2 ++ scriptcraft/build.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/javascript/build.gradle.kts b/examples/javascript/build.gradle.kts index 6f32955..bfa57a9 100644 --- a/examples/javascript/build.gradle.kts +++ b/examples/javascript/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("fabric-loom") version "0.2.7-SNAPSHOT" + id("fabric-loom") version "0.5-SNAPSHOT" } java { @@ -7,7 +7,6 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -base.archivesBaseName = project.property("archives_base_name") as String val modVersion = project.property("mod_version") version = "${modVersion}+${project.property("minecraft_version")}" group = project.property("maven_group")!! diff --git a/examples/javascript/gradle.properties b/examples/javascript/gradle.properties index d556e31..0b84cf1 100644 --- a/examples/javascript/gradle.properties +++ b/examples/javascript/gradle.properties @@ -10,4 +10,3 @@ org.gradle.jvmargs = -Xmx1G # Mod Properties mod_version = 1.0.0 maven_group = com.thebrokenrail - archives_base_name = scriptcraft-javascript-example diff --git a/examples/javascript/settings.gradle.kts b/examples/javascript/settings.gradle.kts index d23c4cb..9d7f415 100644 --- a/examples/javascript/settings.gradle.kts +++ b/examples/javascript/settings.gradle.kts @@ -11,3 +11,5 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = "scriptcraft-javascript-example" diff --git a/examples/typescript/build.gradle.kts b/examples/typescript/build.gradle.kts index 388669a..4952603 100644 --- a/examples/typescript/build.gradle.kts +++ b/examples/typescript/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("fabric-loom") version "0.2.7-SNAPSHOT" + id("fabric-loom") version "0.5-SNAPSHOT" id("com.thebrokenrail.scriptcraft.plugin") version "1.0.0" } @@ -8,7 +8,6 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -base.archivesBaseName = project.property("archives_base_name") as String val modVersion = project.property("mod_version") version = "${modVersion}+${project.property("minecraft_version")}" group = project.property("maven_group")!! diff --git a/examples/typescript/gradle.properties b/examples/typescript/gradle.properties index ef30ecd..0b84cf1 100644 --- a/examples/typescript/gradle.properties +++ b/examples/typescript/gradle.properties @@ -10,4 +10,3 @@ org.gradle.jvmargs = -Xmx1G # Mod Properties mod_version = 1.0.0 maven_group = com.thebrokenrail - archives_base_name = scriptcraft-typescript-example diff --git a/examples/typescript/settings.gradle.kts b/examples/typescript/settings.gradle.kts index d23c4cb..148932f 100644 --- a/examples/typescript/settings.gradle.kts +++ b/examples/typescript/settings.gradle.kts @@ -11,3 +11,5 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = "scriptcraft-typescript-example" diff --git a/scriptcraft/build.gradle.kts b/scriptcraft/build.gradle.kts index 5da0d28..51be768 100644 --- a/scriptcraft/build.gradle.kts +++ b/scriptcraft/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("fabric-loom") version "0.2.7-SNAPSHOT" + id("fabric-loom") version "0.5-SNAPSHOT" id("jni") id("com.thebrokenrail.scriptcraft.plugin") version "1.0.0" `maven-publish`