diff --git a/.gitignore b/.gitignore index 5f60383..d037336 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,8 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ -Tasks/run +*/run +*/logs ### IntelliJ IDEA ### .idea diff --git a/build.gradle b/build.gradle index 873f6f6..836efbb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,40 @@ -allprojects { - group = project.maven_group - version = project.maven_version +plugins { + id 'java' + id 'fabric-loom' version '1.1-SNAPSHOT' apply false } -subprojects { +allprojects { apply plugin: 'java' apply plugin: 'maven-publish' + + group = project.maven_group + version = project.maven_version + sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 + repositories { + maven { + name 'altarik-snapshots' + url 'https://repo.altarik.fr/snapshots/' + } + maven { + name 'altarik-releases' + url 'https://repo.altarik.fr/releases/' + } + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + } + publishing { publications { mavenJava(MavenPublication) { - from components.java + from components.java } - } + } repositories { maven { name 'altarik' @@ -26,6 +46,9 @@ subprojects { } } } +} + +subprojects { dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}" @@ -41,16 +64,18 @@ subprojects { useJUnitPlatform() } - repositories { - maven { - name 'altarik-snapshots' - url 'https://repo.altarik.fr/snapshots/' - } - maven { - name 'altarik-releases' - url 'https://repo.altarik.fr/releases/' - } +} - mavenCentral() +dependencies { + implementation project(':Pagination') +} + + +jar { + dependsOn subprojects.jar + subprojects.each { project -> + from(project.jar) { + into("META-INF/jars/") + } } } diff --git a/gradle.properties b/gradle.properties index b918202..f3d33f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx5G +org.gradle.jvmargs=-Xmx4G junit_version=5.9.0 @@ -10,4 +10,4 @@ fabric_version=0.70.0+1.19.3 maven_group=fr.altarik.toolbox maven_version=4.0.0-SNAPSHOT repo_username=Altarik -repo_password=password \ No newline at end of file +repo_password=password diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..3d55a7b --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "id": "toolbox", + "version": "${version}", + "name": "Altarik Toolbox", + "description": "Altarik Toolbox, for developers", + "authors": [ + "Altarik" + ], + "contributors": [ + "Legot Quentin" + ], + "contact": { + "homepage": "https://altarik.fr" + }, + "license": "Altarik @ All-Rights-Reserved ", + "icon": "assets/quests/icon.png", + "environment": "*", + "mixins": [ + "Task.mixins.json" + ], + "depends": { + "fabricloader": "^0.14.12", + "fabric-api": "*", + "minecraft": "1.19.3", + "java": ">=17" + } + } +