diff --git a/build.gradle.kts b/build.gradle.kts index b0aa552d11..670e06998d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -92,22 +92,16 @@ subprojects { configure { repositories { maven { - name = "runelite" - url = uri("https://maven.pkg.github.com/open-osrs/runelite") - credentials { - username = System.getProperty("gpr_user") - password = System.getProperty("gpr_key") - } + url = uri("$buildDir/repo") } } publications { - register("gpr", MavenPublication::class) { + register("mavenJava", MavenPublication::class) { from(components["java"]) } } } - tasks { java { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/buildSrc/src/main/kotlin/BootstrapPlugin.kt b/buildSrc/src/main/kotlin/BootstrapPlugin.kt index a28ee8ced1..9eeb723478 100644 --- a/buildSrc/src/main/kotlin/BootstrapPlugin.kt +++ b/buildSrc/src/main/kotlin/BootstrapPlugin.kt @@ -31,6 +31,11 @@ class BootstrapPlugin : Plugin { tasks.withType { dependsOn(bootstrapDependencies) + dependsOn(project(":runelite-api").tasks["publish"]) + dependsOn(project(":runescape-api").tasks["publish"]) + dependsOn(project(":http-api").tasks["publish"]) + dependsOn(project(":injected-client").tasks["publish"]) + this.clientJar = clientJar.singleFile doLast { @@ -38,6 +43,15 @@ class BootstrapPlugin : Plugin { from(bootstrapDependencies) into("${buildDir}/bootstrap/${type}/") } + copy { + from( + "${parent?.projectDir}/runelite-client/build/repo/.", + "${parent?.projectDir}/runelite-api/build/repo/.", + "${parent?.projectDir}/http-api/build/repo/.", + "${parent?.projectDir}/runescape-api/build/repo/." + ) + into("${buildDir}/bootstrap/repo/") + } } } } diff --git a/runelite-api/runelite-api.gradle.kts b/runelite-api/runelite-api.gradle.kts index fc7e9ade31..2bba4c0595 100644 --- a/runelite-api/runelite-api.gradle.kts +++ b/runelite-api/runelite-api.gradle.kts @@ -36,4 +36,4 @@ dependencies { implementation(Libraries.slf4jApi) testImplementation(Libraries.junit) -} +} \ No newline at end of file diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index 66423de1dc..438eddf519 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -24,8 +24,8 @@ */ import org.apache.tools.ant.filters.ReplaceTokens -import java.util.Date import java.text.SimpleDateFormat +import java.util.* plugins { id(Plugins.shadow.first) version Plugins.shadow.second