diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d163d8a4..dcdc4de5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.2 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.4 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index f731a43dd..2300f88fd 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.2 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.4 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 7eace9cb3..7444dec88 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.2 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.4 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 2daf64356..5cfaf1f6c 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.2 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.4 secrets: inherit with: project-name: 'Refined Storage' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index f0098ddd5..ee10c5cfc 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.2 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.4 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index a5d3c1b01..161415298 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.2 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.4 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 8822e7eac..d2a2d80d7 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.2 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.4 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 194a3e8c1..449efa5d2 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.2 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.4 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 954c79c7f..b9a5ca08a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [2.0.0-milestone.4.4] - 2024-07-10 + ## [2.0.0-milestone.4.3] - 2024-07-06 ### Added @@ -662,7 +664,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - The Grid can now use smooth scrolling. - The Grid now has syntax highlighting for the search query. -[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.3...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.4...HEAD + +[2.0.0-milestone.4.4]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.3...v2.0.0-milestone.4.4 [2.0.0-milestone.4.3]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.2...v2.0.0-milestone.4.3 diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 8de0cef5e..000000000 --- a/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v${gradle.ext.refinedArchitectVersion}/helper.gradle" - -subprojects { - group = 'com.refinedmods.refinedstorage' - - ext { - apis = [ - ':refinedstorage-core-api', - ':refinedstorage-resource-api', - ':refinedstorage-storage-api', - ':refinedstorage-network-api', - ':refinedstorage-network', - ':refinedstorage-grid-api', - ':refinedstorage-query-parser' - ] - compileApis = [':refinedstorage-platform-api'] - } -} - -enableSonarQube("refinedmods_refinedstorage2") - -sonarqube { - properties { - property "sonar.coverage.exclusions", "refinedstorage-platform-neoforge/**/*,refinedstorage-platform-fabric/**/*,refinedstorage-platform-common/**/*,refinedstorage-platform-api/**/*" - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..cf817e367 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("refinedarchitect.root") + id("refinedarchitect.base") +} + +refinedarchitect { + sonarQube("refinedmods_refinedstorage2", "refinedmods") +} + +subprojects { + group = "com.refinedmods.refinedstorage" +} diff --git a/refinedstorage-core-api/build.gradle b/refinedstorage-core-api/build.gradle deleted file mode 100644 index df2d720ac..000000000 --- a/refinedstorage-core-api/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-core-api' - -dependencies { - api libs.apiguardian - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-core-api/build.gradle.kts b/refinedstorage-core-api/build.gradle.kts new file mode 100644 index 000000000..5171bc700 --- /dev/null +++ b/refinedstorage-core-api/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-core-api") +} + +dependencies { + api(libs.apiguardian) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-grid-api/build.gradle b/refinedstorage-grid-api/build.gradle deleted file mode 100644 index 3cc5d8671..000000000 --- a/refinedstorage-grid-api/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-grid-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage-resource-api') - api project(':refinedstorage-core-api') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-query-parser') - implementation libs.slf4j.api - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testRuntimeOnly libs.slf4j.impl - testImplementation libs.assertj - testImplementation libs.mockito -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-grid-api/build.gradle.kts b/refinedstorage-grid-api/build.gradle.kts new file mode 100644 index 000000000..20861ecd7 --- /dev/null +++ b/refinedstorage-grid-api/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-grid-api") +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-query-parser")) + implementation(libs.slf4j.api) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testImplementation(libs.mockito) + testRuntimeOnly(libs.junit.engine) + testRuntimeOnly(libs.slf4j.impl) +} diff --git a/refinedstorage-network-api/build.gradle b/refinedstorage-network-api/build.gradle deleted file mode 100644 index 6f39e6024..000000000 --- a/refinedstorage-network-api/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-network-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage-core-api') - api project(':refinedstorage-resource-api') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-grid-api') -} - -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-network-api/build.gradle.kts b/refinedstorage-network-api/build.gradle.kts new file mode 100644 index 000000000..8da8c8ed1 --- /dev/null +++ b/refinedstorage-network-api/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-network-api") +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-grid-api")) +} diff --git a/refinedstorage-network-test/build.gradle b/refinedstorage-network-test/build.gradle deleted file mode 100644 index beffa9c07..000000000 --- a/refinedstorage-network-test/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-network-test' - -dependencies { - api project(':refinedstorage-network-api') - api project(':refinedstorage-network') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-resource-api') - api project(':refinedstorage-core-api') - api project(':refinedstorage-grid-api') - implementation libs.junit.api - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-network-test/build.gradle.kts b/refinedstorage-network-test/build.gradle.kts new file mode 100644 index 000000000..a57376fd1 --- /dev/null +++ b/refinedstorage-network-test/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-network-test") +} + +dependencies { + api(project(":refinedstorage-network-api")) + api(project(":refinedstorage-network")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-grid-api")) + implementation(libs.junit.api) + testRuntimeOnly(libs.junit.engine) + testImplementation(libs.assertj) +} diff --git a/refinedstorage-network/build.gradle b/refinedstorage-network/build.gradle deleted file mode 100644 index 4f2b3edab..000000000 --- a/refinedstorage-network/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-network' - -dependencies { - api project(':refinedstorage-core-api') - api project(':refinedstorage-network-api') - api project(':refinedstorage-resource-api') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-grid-api') - implementation libs.slf4j.api - testRuntimeOnly libs.slf4j.impl - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.mockito - testImplementation project(':refinedstorage-network-test') -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enablePublishing() diff --git a/refinedstorage-network/build.gradle.kts b/refinedstorage-network/build.gradle.kts new file mode 100644 index 000000000..47507be9c --- /dev/null +++ b/refinedstorage-network/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-network") +} + +dependencies { + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-network-api")) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-grid-api")) + implementation(libs.slf4j.api) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testImplementation(libs.mockito) + testImplementation(project(":refinedstorage-network-test")) + testRuntimeOnly(libs.slf4j.impl) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-platform-api/build.gradle b/refinedstorage-platform-api/build.gradle deleted file mode 100644 index 91a28b78d..000000000 --- a/refinedstorage-platform-api/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -commonProject() - -archivesBaseName = 'refinedstorage-platform-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage-core-api') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-resource-api') - api project(':refinedstorage-network-api') - api project(':refinedstorage-grid-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.equalsverifier -} - -test { - useJUnitPlatform() -} - -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-platform-api/build.gradle.kts b/refinedstorage-platform-api/build.gradle.kts new file mode 100644 index 000000000..538c23597 --- /dev/null +++ b/refinedstorage-platform-api/build.gradle.kts @@ -0,0 +1,30 @@ +plugins { + id("refinedarchitect.common") +} + +refinedarchitect { + common() + testing() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-platform-api") +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-network-api")) + api(project(":refinedstorage-grid-api")) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testImplementation(libs.equalsverifier) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-platform-api/src/main/resources/fabric.mod.json b/refinedstorage-platform-api/src/main/resources/fabric.mod.json deleted file mode 100644 index 9678c35d8..000000000 --- a/refinedstorage-platform-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage-platform-api", - "version": "${version}", - "name": "Refined Storage Platform API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage-platform-common/build.gradle b/refinedstorage-platform-common/build.gradle deleted file mode 100644 index f9e3a5427..000000000 --- a/refinedstorage-platform-common/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-platform-common' - -commonProject() - -dependencies { - api project(':refinedstorage-platform-api') - api project(':refinedstorage-core-api') - api project(':refinedstorage-resource-api') - api project(':refinedstorage-storage-api') - api project(':refinedstorage-network-api') - api project(':refinedstorage-network') - api project(':refinedstorage-query-parser') - api project(':refinedstorage-grid-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.equalsverifier -} - -test { - useJUnitPlatform() -} - -enablePublishing() diff --git a/refinedstorage-platform-common/build.gradle.kts b/refinedstorage-platform-common/build.gradle.kts new file mode 100644 index 000000000..4d92d6eb1 --- /dev/null +++ b/refinedstorage-platform-common/build.gradle.kts @@ -0,0 +1,32 @@ +plugins { + id("refinedarchitect.common") +} + +refinedarchitect { + common() + testing() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-platform-common") +} + +dependencies { + api(project(":refinedstorage-platform-api")) + api(project(":refinedstorage-core-api")) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-storage-api")) + api(project(":refinedstorage-network-api")) + api(project(":refinedstorage-network")) + api(project(":refinedstorage-query-parser")) + api(project(":refinedstorage-grid-api")) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testImplementation(libs.equalsverifier) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-platform-fabric/build.gradle b/refinedstorage-platform-fabric/build.gradle deleted file mode 100644 index 1eb0f41ff..000000000 --- a/refinedstorage-platform-fabric/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -archivesBaseName = 'refinedstorage-platform-fabric' - -repositories { - maven { - name = 'ModMenu' - url 'https://maven.terraformersmc.com/' - } - maven { - name = 'Cloth Config' - url 'https://maven.shedaniel.me/' - } -} - -fabricProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis) - -dependencies { - modApi(libs.cloth.config) { - exclude(group: 'net.fabricmc.fabric-api') - } - include libs.cloth.config - - modApi(libs.teamreborn.energy) { - exclude(group: 'net.fabricmc.fabric-api') - } - include libs.teamreborn.energy - - modApi libs.modmenu -} - -enablePublishing() - diff --git a/refinedstorage-platform-fabric/build.gradle.kts b/refinedstorage-platform-fabric/build.gradle.kts new file mode 100644 index 000000000..9b36e7251 --- /dev/null +++ b/refinedstorage-platform-fabric/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("refinedarchitect.fabric") +} + +repositories { + maven { + name = "ModMenu" + url = uri("https://maven.terraformersmc.com/") + } + maven { + name = "Cloth Config" + url = uri("https://maven.shedaniel.me/") + } +} + +refinedarchitect { + modId = "refinedstorage" + fabric() + compileWithProject(project(":refinedstorage-platform-common")) + compileWithProject(project(":refinedstorage-platform-api")) + addProject(project(":refinedstorage-core-api")) + addProject(project(":refinedstorage-resource-api")) + addProject(project(":refinedstorage-storage-api")) + addProject(project(":refinedstorage-network-api")) + addProject(project(":refinedstorage-network")) + addProject(project(":refinedstorage-grid-api")) + addProject(project(":refinedstorage-query-parser")) + publishing { + maven = true + // curseForge = "243076" + // modrinth = "refined-storage" + } +} + +base { + archivesName.set("refinedstorage-platform-fabric") +} + +dependencies { + modApi(libs.cloth.config) { + exclude(group = "net.fabricmc.fabric-api") + } + modApi(libs.teamreborn.energy) { + exclude(group = "net.fabricmc.fabric-api") + } + modApi(libs.modmenu) + include(libs.cloth.config) + include(libs.teamreborn.energy) +} diff --git a/refinedstorage-platform-neoforge/build.gradle b/refinedstorage-platform-neoforge/build.gradle deleted file mode 100644 index 8386aac06..000000000 --- a/refinedstorage-platform-neoforge/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -neoForgeProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis) - -archivesBaseName = 'refinedstorage-platform-neoforge' - -enablePublishing() - -// This avoids a build failure when running the "test" task, because there is no JUnit engine -// in this subproject. -// The test source set in this subproject is used for Minecraft game tests, not for JUnit tests. -test.onlyIf { false } diff --git a/refinedstorage-platform-neoforge/build.gradle.kts b/refinedstorage-platform-neoforge/build.gradle.kts new file mode 100644 index 000000000..6d66e6a37 --- /dev/null +++ b/refinedstorage-platform-neoforge/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("refinedarchitect.neoforge") +} + +refinedarchitect { + modId = "refinedstorage" + neoForge() + gameTests() + dataGeneration(project(":refinedstorage-platform-common")) + compileWithProject(project(":refinedstorage-platform-common")) + compileWithProject(project(":refinedstorage-platform-api")) + compileWithProject(project(":refinedstorage-core-api")) + compileWithProject(project(":refinedstorage-resource-api")) + compileWithProject(project(":refinedstorage-storage-api")) + compileWithProject(project(":refinedstorage-network-api")) + compileWithProject(project(":refinedstorage-network")) + compileWithProject(project(":refinedstorage-grid-api")) + compileWithProject(project(":refinedstorage-query-parser")) + publishing { + maven = true + // curseForge = "243076" + // modrinth = "refined-storage" + } +} + +base { + archivesName.set("refinedstorage-platform-neoforge") +} diff --git a/refinedstorage-query-parser/build.gradle b/refinedstorage-query-parser/build.gradle deleted file mode 100644 index 9a1d982bf..000000000 --- a/refinedstorage-query-parser/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-query-parser' - -dependencies { - api project(':refinedstorage-core-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-query-parser/build.gradle.kts b/refinedstorage-query-parser/build.gradle.kts new file mode 100644 index 000000000..7e9d7f003 --- /dev/null +++ b/refinedstorage-query-parser/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-query-parser") +} + +dependencies { + api(project(":refinedstorage-core-api")) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-resource-api/build.gradle b/refinedstorage-resource-api/build.gradle deleted file mode 100644 index cb1dda6b4..000000000 --- a/refinedstorage-resource-api/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-resource-api' - -dependencies { - api libs.apiguardian - api project(":refinedstorage-core-api") - testImplementation libs.junit.api - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-resource-api/build.gradle.kts b/refinedstorage-resource-api/build.gradle.kts new file mode 100644 index 000000000..1049d35b9 --- /dev/null +++ b/refinedstorage-resource-api/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-resource-api") +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-core-api")) + testImplementation(libs.junit.api) + testImplementation(libs.assertj) + testRuntimeOnly(libs.junit.engine) +} diff --git a/refinedstorage-storage-api/build.gradle b/refinedstorage-storage-api/build.gradle deleted file mode 100644 index c387e35df..000000000 --- a/refinedstorage-storage-api/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage-storage-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage-resource-api') - api project(':refinedstorage-core-api') - implementation libs.slf4j.api - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testRuntimeOnly libs.slf4j.impl - testImplementation libs.assertj - testImplementation libs.mockito -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage-storage-api/build.gradle.kts b/refinedstorage-storage-api/build.gradle.kts new file mode 100644 index 000000000..8914d8f6d --- /dev/null +++ b/refinedstorage-storage-api/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + id("refinedarchitect.base") +} + +refinedarchitect { + testing() + mutationTesting() + javadoc() + publishing { + maven = true + } +} + +base { + archivesName.set("refinedstorage-storage-api") +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-resource-api")) + api(project(":refinedstorage-core-api")) + implementation(libs.slf4j.api) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.assertj) + testImplementation(libs.mockito) + testRuntimeOnly(libs.junit.engine) + testRuntimeOnly(libs.slf4j.impl) +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 6c3f1e3aa..000000000 --- a/settings.gradle +++ /dev/null @@ -1,32 +0,0 @@ -gradle.ext.refinedArchitectVersion = "0.15.2" - -dependencyResolutionManagement { - repositories { - maven { - url = "https://maven.pkg.github.com/refinedmods/refinedarchitect" - credentials { - username = "anything" - password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" - } - } - } - versionCatalogs { - create("libs") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog:${gradle.ext.refinedArchitectVersion}") - } - } -} - -rootProject.name = 'refinedstorage' -include 'refinedstorage-core-api' -include 'refinedstorage-resource-api' -include 'refinedstorage-storage-api' -include 'refinedstorage-query-parser' -include 'refinedstorage-grid-api' -include 'refinedstorage-network-api' -include 'refinedstorage-network' -include 'refinedstorage-platform-api' -include 'refinedstorage-platform-fabric' -include 'refinedstorage-platform-neoforge' -include 'refinedstorage-platform-common' -include 'refinedstorage-network-test' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..19f3b009f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,59 @@ +dependencyResolutionManagement { + repositories { + maven { + url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect") + credentials { + username = "anything" + password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" + } + } + } + versionCatalogs { + create("libs") { + from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.4") + } + } +} + +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { + url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect") + credentials { + username = "anything" + password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" + } + } + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + maven { + name = "NeoForge" + url = uri("https://maven.neoforged.net/releases") + } + } + plugins { + id("refinedarchitect.root").version("0.16.4") + id("refinedarchitect.base").version("0.16.4") + id("refinedarchitect.common").version("0.16.4") + id("refinedarchitect.neoforge").version("0.16.4") + id("refinedarchitect.fabric").version("0.16.4") + } +} + +rootProject.name = "refinedstorage" +include("refinedstorage-core-api") +include("refinedstorage-resource-api") +include("refinedstorage-storage-api") +include("refinedstorage-query-parser") +include("refinedstorage-grid-api") +include("refinedstorage-network-api") +include("refinedstorage-network") +include("refinedstorage-platform-api") +include("refinedstorage-platform-fabric") +include("refinedstorage-platform-neoforge") +include("refinedstorage-platform-common") +include("refinedstorage-network-test")