Skip to content

Commit

Permalink
Rework gradle-build system (#574)
Browse files Browse the repository at this point in the history
* Rework gradle-build setup

* Fix versioning

* Fix github build

* Configure publishing

* Push BlueMapAPI

* Reorganize project naming

* Update neoforge-gradle

* Add gradle-stracktrace to github action

* Remove clean gradle target to hopefully no longer upset neogradle for some reason

* Update gradle and add stacktrace to github action again

* Update neogradle

* Switch to neoforges ModDevGradle
  • Loading branch information
TBlueF authored Sep 12, 2024
1 parent 38a8423 commit 1454297
Show file tree
Hide file tree
Showing 813 changed files with 1,035 additions and 9,641 deletions.
2 changes: 1 addition & 1 deletion .github/translation-checker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function parse(str) {
return nodes;
}

const langFolder = "../../BlueMapCommon/webapp/public/lang/";
const langFolder = "../../common/webapp/public/lang/";
const languageFiles = readdirSync(langFolder).filter(
(f) => f.endsWith(".conf") && f !== "settings.conf"
);
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: |
16
17
21
java-version: 21
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew clean spotlessCheck test build
run: ./gradlew spotlessCheck test release --stacktrace
- uses: actions/upload-artifact@v4
with:
name: artifacts
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/publish.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ doc/
logs/
.run/
run/
runs/
node_modules/

.classpath
Expand All @@ -17,8 +18,8 @@ node_modules/
release.md

# exclude generated resource
BlueMapCommon/src/main/resources/de/bluecolored/bluemap/webapp.zip
BlueMapCore/src/main/resources/de/bluecolored/bluemap/resourceExtensions.zip
common/src/main/resources/de/bluecolored/bluemap/webapp.zip
core/src/main/resources/de/bluecolored/bluemap/resourceExtensions.zip

#exclude-test-data
data/test-render
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "BlueMapAPI"]
path = BlueMapAPI
path = api
url = https://github.com/BlueMap-Minecraft/BlueMapAPI
1 change: 0 additions & 1 deletion BlueMapAPI
Submodule BlueMapAPI deleted from ec9771
148 changes: 0 additions & 148 deletions BlueMapCommon/build.gradle.kts

This file was deleted.

4 changes: 0 additions & 4 deletions BlueMapCommon/settings.gradle.kts

This file was deleted.

Loading

0 comments on commit 1454297

Please sign in to comment.