Skip to content

Commit

Permalink
chore: upgrade refined architect
Browse files Browse the repository at this point in the history
  • Loading branch information
raoulvdberge committed Jul 9, 2024
1 parent 99d03dd commit e560ad7
Show file tree
Hide file tree
Showing 19 changed files with 198 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
with:
mutation-testing: false
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
with:
release-type: ${{ inputs.release-type }}
version-number-override: ${{ inputs.version-number-override }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-for-unsupported-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.2
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
secrets: inherit
with:
project-name: 'Refined Storage - JEI Integration'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/resolved-issue-locking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
- cron: '0 0 * * *'
jobs:
lock:
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.2
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.2
2 changes: 1 addition & 1 deletion .github/workflows/validate-branch-name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.2
2 changes: 1 addition & 1 deletion .github/workflows/validate-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.2
2 changes: 1 addition & 1 deletion .github/workflows/validate-commit-messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.2
7 changes: 0 additions & 7 deletions build.gradle

This file was deleted.

11 changes: 11 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
plugins {
id("refinedarchitect.root")
}

refinedarchitect {
sonarQube("refinedmods_refinedstorage-jei-integration", "refinedmods")
}

subprojects {
group = "com.refinedmods.refinedstorage"
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
refinedstorageVersion=2.0.0-milestone.4.2
jeiVersion=19.1.0.17
minecraftVersion=1.21
# Gradle
org.gradle.jvmargs=-Xmx1G
29 changes: 0 additions & 29 deletions refinedstorage-jei-integration-common/build.gradle

This file was deleted.

38 changes: 38 additions & 0 deletions refinedstorage-jei-integration-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
plugins {
id("refinedarchitect.common")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "JEI"
url = uri("https://maven.blamejared.com/")
}
}

refinedarchitect {
common()
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-jei-integration-common")
}

val refinedstorageVersion: String by project
val jeiVersion: String by project
val minecraftVersion: String by project

dependencies {
api("com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}")
api("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
api("mezz.jei:jei-${minecraftVersion}-common:${jeiVersion}")
}
38 changes: 0 additions & 38 deletions refinedstorage-jei-integration-fabric/build.gradle

This file was deleted.

49 changes: 49 additions & 0 deletions refinedstorage-jei-integration-fabric/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
plugins {
id("refinedarchitect.fabric")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "ModMenu"
url = uri("https://maven.terraformersmc.com/")
}
maven {
name = "Cloth Config"
url = uri("https://maven.shedaniel.me/")
}
maven {
name = "JEI"
url = uri("https://maven.blamejared.com/")
}
}

refinedarchitect {
modId = "refinedstorage_jei_integration"
fabric()
compileWithProject(project(":refinedstorage-jei-integration-common"))
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-jei-integration-fabric")
}

val refinedstorageVersion: String by project
val jeiVersion: String by project
val minecraftVersion: String by project

dependencies {
modApi("com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}")
modRuntimeOnly("mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}")
modCompileOnlyApi("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
modCompileOnlyApi("mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}")
}
30 changes: 0 additions & 30 deletions refinedstorage-jei-integration-neoforge/build.gradle

This file was deleted.

41 changes: 41 additions & 0 deletions refinedstorage-jei-integration-neoforge/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
plugins {
id("refinedarchitect.neoforge")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "JEI"
url = uri("https://maven.blamejared.com/")
}
}

refinedarchitect {
modId = "refinedstorage_jei_integration"
neoForge()
compileWithProject(project(":refinedstorage-jei-integration-common"))
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-jei-integration-neoforge")
}

val refinedstorageVersion: String by project
val jeiVersion: String by project
val minecraftVersion: String by project

dependencies {
api("com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}")
runtimeOnly("mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}")
compileOnlyApi("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
compileOnlyApi("mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}")
}
18 changes: 0 additions & 18 deletions settings.gradle

This file was deleted.

50 changes: 50 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
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.2")
}
}
}

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.2")
id("refinedarchitect.base").version("0.16.2")
id("refinedarchitect.common").version("0.16.2")
id("refinedarchitect.neoforge").version("0.16.2")
id("refinedarchitect.fabric").version("0.16.2")
}
}

rootProject.name = "refinedstorage-jei-integration"
include("refinedstorage-jei-integration-common")
include("refinedstorage-jei-integration-neoforge")
include("refinedstorage-jei-integration-fabric")

0 comments on commit e560ad7

Please sign in to comment.