From 094e096469936734ad81e691ca9358a593df502c Mon Sep 17 00:00:00 2001 From: PKLite Date: Fri, 4 Oct 2019 19:03:42 -0400 Subject: [PATCH] add bandages Signed-off-by: PKLite --- .../openosrs/strapper/controllers/StrapController.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/dev/openosrs/strapper/controllers/StrapController.kt b/src/main/kotlin/dev/openosrs/strapper/controllers/StrapController.kt index 5743a2b..1cc2aff 100644 --- a/src/main/kotlin/dev/openosrs/strapper/controllers/StrapController.kt +++ b/src/main/kotlin/dev/openosrs/strapper/controllers/StrapController.kt @@ -64,6 +64,13 @@ class StrapController() : Controller() { } } + private fun addStaticDependencies() { + //bandage for static artifacts + newBootstrap.artifacts.addAll(bootstrap.artifacts.filter { + artifact -> artifact.path.contains("nexus.thatgamerblue.com") + || artifact.path.contains("natives") }.toList()) + } + private fun buildBootstrap(dir: File) { newBootstrap.launcherJvm11Arguments = bootstrap.launcherJvm11Arguments @@ -78,7 +85,6 @@ class StrapController() : Controller() { processDependencyURL(it.path, it) Bootstrap.validationQueue.add(it) } - addBuildArtifacts(dir) } @@ -142,6 +148,9 @@ class StrapController() : Controller() { if (projectVersion.isNotEmpty()) { buildBootstrap(dir) + addStaticDependencies() + addBuildArtifacts(dir) + completeStrapping() newBootstrap.projectVersionProperty.value = projectVersion newBootstrap.buildCommitProperty.value = head.toString() @@ -222,7 +231,6 @@ class StrapController() : Controller() { } logger.info { "found artifact $s" } } - completeStrapping() } private fun showErrorMessage(e: Exception) {