Moving all pagination work

Signed-off-by: Quentin Legot <legotquentin@gmail.com>
This commit is contained in:
Quentin Legot 2023-03-02 15:07:27 +01:00
commit 7a21af570b
8 changed files with 78 additions and 46 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ build/
!**/src/test/**/build/ !**/src/test/**/build/
*/run */run
*/logs
### IntelliJ IDEA ### ### IntelliJ IDEA ###
.idea .idea

View File

@ -1,11 +1,4 @@
dependencies { dependencies {
implementation 'org.postgresql:postgresql:42.5.0' implementation 'org.postgresql:postgresql:42.5.0'
testImplementation 'com.google.code.gson:gson:2.10' testImplementation 'com.google.code.gson:gson:2.10'
testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}"
} }
test {
useJUnitPlatform()
}

View File

@ -1,6 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.1-SNAPSHOT' id 'fabric-loom'
} }
dependencies { dependencies {
@ -9,9 +8,6 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}"
} }
processResources { processResources {
@ -36,9 +32,4 @@ tasks.withType(JavaCompile).configureEach {
if (JavaVersion.current().isJava9Compatible()) { if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion it.options.release = targetVersion
} }
} }
test {
useJUnitPlatform()
}

View File

@ -14,7 +14,6 @@ public interface PaginationApi {
* <p>Special values are: * <p>Special values are:
* <ul><li><b>null</b> if you doesn't want to add a header</li> * <ul><li><b>null</b> if you doesn't want to add a header</li>
* <li><b>empty String</b> if you want just the header to be filled only with "="</li></ul> * <li><b>empty String</b> if you want just the header to be filled only with "="</li></ul>
* </p>
* @throws IllegalArgumentException if one of its conditions is met: <ol> * @throws IllegalArgumentException if one of its conditions is met: <ol>
* <li><b>header</b> length is more than 50 characters</li> * <li><b>header</b> length is more than 50 characters</li>
* <li><b>content</b> is empty</li> * <li><b>content</b> is empty</li>

View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.1-SNAPSHOT' id 'fabric-loom'
} }
@ -9,9 +9,6 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}"
} }
processResources { processResources {
@ -37,8 +34,3 @@ tasks.withType(JavaCompile).configureEach {
it.options.release = targetVersion it.options.release = targetVersion
} }
} }
test {
useJUnitPlatform()
}

View File

@ -1,20 +1,40 @@
allprojects { plugins {
group = project.maven_group id 'java'
version = project.maven_version id 'fabric-loom' version '1.1-SNAPSHOT' apply false
} }
subprojects { allprojects {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
group = project.maven_group
version = project.maven_version
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = 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 { publishing {
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
from components.java from components.java
} }
} }
repositories { repositories {
maven { maven {
name 'altarik' name 'altarik'
@ -26,24 +46,31 @@ subprojects {
} }
} }
} }
}
subprojects {
dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}"
}
java { java {
withSourcesJar() withSourcesJar()
withJavadocJar() withJavadocJar()
} }
test {
useJUnitPlatform()
}
repositories { }
maven {
name 'altarik-snapshots'
url 'https://repo.altarik.fr/snapshots/'
}
maven {
name 'altarik-releases'
url 'https://repo.altarik.fr/releases/'
}
mavenCentral() jar {
dependsOn subprojects.jar
subprojects.each { project ->
from(project.jar) {
into("META-INF/jars/")
}
} }
} }

View File

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx5G org.gradle.jvmargs=-Xmx4G
junit_version=5.9.0 junit_version=5.9.0
@ -10,4 +10,4 @@ fabric_version=0.75.1+1.19.3
maven_group=fr.altarik.toolbox maven_group=fr.altarik.toolbox
maven_version=4.0.0-SNAPSHOT maven_version=4.0.0-SNAPSHOT
repo_username=Altarik repo_username=Altarik
repo_password=password repo_password=password

View File

@ -0,0 +1,29 @@
{
"schemaVersion": 1,
"id": "toolbox",
"version": "${version}",
"name": "Altarik Toolbox",
"description": "Altarik Toolbox, for developers",
"authors": [
"Altarik"
],
"contributors": [
"Legot Quentin<legotquentin@gmail.com>"
],
"contact": {
"homepage": "https://altarik.fr"
},
"license": "Altarik @ All-Rights-Reserved ",
"icon": "assets/quests/icon.png",
"environment": "*",
"mixins": [
"toolbox.mixins.json"
],
"depends": {
"fabricloader": "^0.14.12",
"fabric-api": "*",
"minecraft": "1.19.3",
"java": ">=17"
}
}