Fix a few issues with building on windows

This commit is contained in:
Joshua Rodriguez 2020-01-14 14:38:03 -08:00
parent cebe8b93ad
commit 989e4253f2
6 changed files with 15 additions and 15 deletions

View File

@ -39,6 +39,7 @@ task zipWebroot(type: Zip) {
// removes tmp build directory, build project with webpack, zip contents for the shaded jar // removes tmp build directory, build project with webpack, zip contents for the shaded jar
task buildWebroot { task buildWebroot {
dependsOn 'npmInstall'
dependsOn 'cleanWebroot' dependsOn 'cleanWebroot'
dependsOn 'webpackWebroot' dependsOn 'webpackWebroot'
dependsOn 'zipWebroot' dependsOn 'zipWebroot'

View File

@ -1,9 +1,7 @@
{ {
"name": "bluemap", "name": "bluemap",
"version": "1.0.0",
"description": "BlueMap is a tool that generates 3d-maps of your Minecraft worlds and displays them in your browser.", "description": "BlueMap is a tool that generates 3d-maps of your Minecraft worlds and displays them in your browser.",
"private": true, "private": true,
"main": "bluemap.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/BlueMap-Minecraft/BlueMap.git" "url": "git+https://github.com/BlueMap-Minecraft/BlueMap.git"
@ -24,6 +22,7 @@
"devDependencies": { "devDependencies": {
"css-loader": "^3.4.2", "css-loader": "^3.4.2",
"fibers": "^4.0.2", "fibers": "^4.0.2",
"file-loader": "^5.0.2",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.0", "node-sass": "^4.13.0",

View File

@ -1,5 +1,5 @@
dependencies { dependencies {
shadow "org.spongepowered:spongeapi:7.1.0-SNAPSHOT" compile "org.spongepowered:spongeapi:7.1.0-SNAPSHOT"
compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5' compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5'
compile project(':BlueMapCore') compile project(':BlueMapCore')
} }

View File

@ -15,7 +15,7 @@ Easy:
`git clone https://github.com/BlueMap-Minecraft/BlueMap.git` `git clone https://github.com/BlueMap-Minecraft/BlueMap.git`
### Build ### Build
In order to build BlueMap you simply need to run the `./gradlew shadowJar` command. In order to build BlueMap you simply need to run the `./gradlew build` command.
You can find the compiled JAR file in `./build/libs` You can find the compiled JAR file in `./build/libs`
### Issues / Suggestions ### Issues / Suggestions

View File

@ -1,6 +1,6 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '5.1.0' id 'com.github.johnrengelman.shadow' version '1.2.4'
} }
allprojects { allprojects {
@ -31,7 +31,7 @@ dependencies {
//compile project(':BlueMapSponge') //compile project(':BlueMapSponge')
} }
shadowJar { assemble.dependsOn shadowJar {
baseName = 'BlueMap' baseName = 'BlueMap'
version = null version = null
classifier = null classifier = null

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists