Skip to content

Commit

Permalink
chore: bump to refined architect v0.15.3
Browse files Browse the repository at this point in the history
  • Loading branch information
raoulvdberge committed Jul 6, 2024
1 parent 9722899 commit 28b2d11
Show file tree
Hide file tree
Showing 23 changed files with 20 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body:
description: |
If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
options:
- Minecraft 1.20.4
- Minecraft 1.21
validations:
required: true
- type: input
Expand Down
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.3
with:
mutation-testing: false
sonarqube: false
Expand Down
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.3
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.3
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.3
secrets: inherit
with:
project-name: 'Refined Architect template'
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.3
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.3
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.3
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.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.3
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ out/
/bin/
logs/
.cache/
run/
2 changes: 2 additions & 0 deletions config/intellij-code-style.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<code_scheme name="Refined Mods" version="173">
<JavaCodeStyleSettings>
<option name="GENERATE_FINAL_LOCALS" value="true" />
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
<option name="SPACE_INSIDE_ONE_LINE_ENUM_BRACES" value="true" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 0 additions & 1 deletion refinedarchitect-template-platform-fabric/.gitignore

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"depends": {
"fabricloader": ">=0.14.6",
"fabric-api": "*",
"minecraft": "~1.20.4",
"minecraft": "~1.21",
"java": ">=17"
}
}
1 change: 0 additions & 1 deletion refinedarchitect-template-platform-forge/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions refinedarchitect-template-platform-forge/build.gradle

This file was deleted.

3 changes: 3 additions & 0 deletions refinedarchitect-template-platform-neoforge/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
archivesBaseName = 'refinedarchitect-template-platform-neoforge'

neoForgeProject("refinedarchitecttemplate", project(":refinedarchitect-template-platform-common"))
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.refinedmods.refinedarchitect.template.platform.forge;

import com.refinedmods.refinedarchitect.template.platform.common.Common;

import net.neoforged.api.distmarker.Dist;

Check failure on line 4 in refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ModInitializer.java

View workflow job for this annotation

GitHub Actions / build / build

'net.neoforged.api.distmarker.Dist' should be separated from previous import group by one line.
import net.neoforged.bus.api.IEventBus;
import net.neoforged.bus.api.SubscribeEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"description": {
"text": "Refined Architect template resources"
},
"pack_format": 18
"pack_format": 34
}
}
13 changes: 2 additions & 11 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
gradle.ext.refinedArchitectVersion = "0.12.1"
gradle.ext.refinedArchitectVersion = "0.15.3"

dependencyResolutionManagement {
repositories {
Expand All @@ -11,15 +11,6 @@ dependencyResolutionManagement {
}
}
versionCatalogs {
create("common") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-common:${gradle.ext.refinedArchitectVersion}")
}
create("fabric") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-fabric:${gradle.ext.refinedArchitectVersion}")
}
create("forge") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-forge:${gradle.ext.refinedArchitectVersion}")
}
create("libs") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog:${gradle.ext.refinedArchitectVersion}")
}
Expand All @@ -28,5 +19,5 @@ dependencyResolutionManagement {

rootProject.name = 'refinedarchitect-template'
include 'refinedarchitect-template-platform-common'
include 'refinedarchitect-template-platform-forge'
include 'refinedarchitect-template-platform-neoforge'
include 'refinedarchitect-template-platform-fabric'

0 comments on commit 28b2d11

Please sign in to comment.