diff --git a/.gitignore b/.gitignore index 278e64a..9254aec 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ !/.gitignore !/.gitattributes -!/build.js !/LICENSE !/README.md !/settings.gradle diff --git a/build.gradle b/build.gradle index 865d2db..187c46b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,39 +1,32 @@ plugins { - id 'application' + id "application" } java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 - toolchain.languageVersion = JavaLanguageVersion.of(11) + withSourcesJar() } jar { - manifest { - attributes ( - 'Main-Class': project.main_class - ) - } + manifest.attributes["Main-class"] = project.main_class } sourceSets { - main.java.srcDirs = [ 'src/java' ] - main.resources.srcDirs = [ 'src/assets' ] + main.java.srcDirs = [ "src/java" ] + main.resources.srcDirs = [ "src/assets" ] } processResources { - filesMatching('metadata.json') { - expand ( - 'version': project.project_version, - 'name': project.project_name + filesMatching "metadata.json", { + expand( + version: project.project_version, + name: project.project_name ) } } -application { - mainClass = project.main_class -} - -archivesBaseName = project.project_name -version = project.project_version \ No newline at end of file +base.archivesName = project.project_name +version = project.project_version +group = project.project_group \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c152a45..d1cf5ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +project_group = me.topchetoeu project_name = jscript project_version = 0.8.4-beta main_class = me.topchetoeu.jscript.utils.JScriptRepl diff --git a/settings.gradle b/settings.gradle index 63dcd1a..fc7ee6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,5 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' -} \ No newline at end of file +} + +rootProject.name = properties.project_name