ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2722 from Lucwousin/from-the-gradle-to-the-grave

Browse Source 
gradle: Optimizations/cleanup
This commit is contained in:
Lucwousin
2020-06-28 03:13:09 +02:00
committed by GitHub
parent 9f6e4dd8a6 64564ab1c0
commit 63a7b03ef7
7 changed files with 48 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildSrc/src/main/kotlin/BootstrapPlugin.kt
View File

@@ -4,20 +4,13 @@ import org.gradle.kotlin.dsl.*
class BootstrapPlugin : Plugin<Project> { class BootstrapPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = with(project) { override fun apply(project: Project): Unit = with(project) {
val clientJar by configurations.creating {
isCanBeConsumed = false
isCanBeResolved = true
isTransitive = false
}
val bootstrapDependencies by configurations.creating { val bootstrapDependencies by configurations.creating {
extendsFrom(clientJar)
isCanBeConsumed = false isCanBeConsumed = false
isCanBeResolved = true isCanBeResolved = true
isTransitive = false isTransitive = false
} }
dependencies { dependencies {
clientJar(tasks["jar"].outputs.files)
bootstrapDependencies(project(":runelite-api")) bootstrapDependencies(project(":runelite-api"))
bootstrapDependencies(project(":runescape-api")) bootstrapDependencies(project(":runescape-api"))
bootstrapDependencies(project(":http-api")) bootstrapDependencies(project(":http-api"))
@@ -29,6 +22,9 @@ class BootstrapPlugin : Plugin<Project> {
tasks.register<BootstrapTask>("bootstrapStable", "stable") tasks.register<BootstrapTask>("bootstrapStable", "stable")
tasks.withType<BootstrapTask> { tasks.withType<BootstrapTask> {
this.group = "openosrs"
this.clientJar.fileProvider(provider { tasks["jar"].outputs.files.singleFile })
dependsOn(bootstrapDependencies) dependsOn(bootstrapDependencies)
dependsOn("publish") dependsOn("publish")
dependsOn(project(":runelite-api").tasks["publish"]) dependsOn(project(":runelite-api").tasks["publish"])
@@ -36,8 +32,6 @@ class BootstrapPlugin : Plugin<Project> {
dependsOn(project(":http-api").tasks["publish"]) dependsOn(project(":http-api").tasks["publish"])
dependsOn(project(":injected-client").tasks["publish"]) dependsOn(project(":injected-client").tasks["publish"])
this.clientJar = clientJar.singleFile
doLast { doLast {
copy { copy {
from(bootstrapDependencies) from(bootstrapDependencies)

18
buildSrc/src/main/kotlin/BootstrapTask.kt
View File

@@ -1,9 +1,6 @@
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.*
import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.PathSensitivity
import org.gradle.api.tasks.TaskAction
import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.get
import java.io.File import java.io.File
@@ -14,7 +11,7 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT
@InputFile @InputFile
@PathSensitive(PathSensitivity.ABSOLUTE) @PathSensitive(PathSensitivity.ABSOLUTE)
var clientJar: File? = null val clientJar: RegularFileProperty = project.objects.fileProperty()
@Input @Input
val launcherJvm11Arguments = arrayOf("-XX:+DisableAttachMechanism", "-Drunelite.launcher.nojvm=true", "-Xmx1G", "-Xss2m", "-XX:CompileThreshold=1500", "-Djna.nosys=true") val launcherJvm11Arguments = arrayOf("-XX:+DisableAttachMechanism", "-Drunelite.launcher.nojvm=true", "-Xmx1G", "-Xss2m", "-XX:CompileThreshold=1500", "-Djna.nosys=true")
@@ -81,11 +78,12 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT
} }
} }
val cjar = clientJar.get().asFile
artifacts.add(JsonBuilder( artifacts.add(JsonBuilder(
"name" to clientJar!!.name, "name" to cjar.name,
"path" to "https://github.com/open-osrs/hosting/raw/master/${type}/${clientJar!!.name}", "path" to "https://github.com/open-osrs/hosting/raw/master/${type}/${cjar.name}",
"size" to clientJar!!.length(), "size" to cjar.length(),
"hash" to hash(clientJar!!.readBytes()) "hash" to hash(cjar.readBytes())
)) ))
return artifacts.toTypedArray() return artifacts.toTypedArray()

13
injected-client/injected-client.gradle.kts
View File

@@ -45,7 +45,6 @@ val combined by configurations.creating {
configurations { configurations {
all { all {
isTransitive = false isTransitive = false
outgoing.artifact(tasks.inject.get().output)
} }
} }
@@ -63,10 +62,8 @@ injector {
vanilla.set(vanillaDep.singleFile) vanilla.set(vanillaDep.singleFile)
} }
sourceSets { artifacts {
main { runtimeElements(tasks.inject.get().output)
output.dir(tasks.inject.get().output.get().asFile.parentFile, "builtBy" to tasks.inject)
}
} }
// keep the sourcesets etc but remove useless tasks // keep the sourcesets etc but remove useless tasks
@@ -83,7 +80,13 @@ tasks {
jar { jar {
enabled = false enabled = false
} }
sourcesJar {
enabled = false
}
processResources { processResources {
enabled = false enabled = false
} }
assemble {
finalizedBy("inject")
}
} }

2
runelite-client/runelite-client.gradle.kts
View File

@@ -143,7 +143,7 @@ tasks {
} }
processResources { processResources {
dependsOn(":runelite-script-assembler-plugin:indexMojo") dependsOn(":runelite-script-assembler-plugin:assembleMojo")
from("${buildDir}/scripts") from("${buildDir}/scripts")
} }

46
runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts
View File

@@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2019 Owain van Brakel <https://github.com/Owain94> * Copyright (c) 2019 Owain van Brakel <https://github.com/Owain94>
* Copyright (c) 2020 Lucas <https://github.com/Lucwousin>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -22,6 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
import java.io.DataOutputStream as DOS
description = "Script Assembler Plugin" description = "Script Assembler Plugin"
@@ -39,34 +41,28 @@ dependencies {
tasks { tasks {
register<JavaExec>("assembleMojo") { register<JavaExec>("assembleMojo") {
inputs.files( outputs.cacheIf { true }
fileTree("${project.extra["rootPath"]}/runelite-client/src/main/scripts") val inp = "${project.extra["rootPath"]}/runelite-client/src/main/scripts"
) val out = "${project.extra["rootPath"]}/runelite-client/build/scripts/runelite"
inputs.dir(inp)
outputs.dir("${project.extra["rootPath"]}/runelite-client/build/scripts/runelite"); outputs.dir(out)
classpath = project.sourceSets.main.get().runtimeClasspath classpath = project.sourceSets.main.get().runtimeClasspath
main = "net.runelite.script.AssembleMojo" main = "net.runelite.script.AssembleMojo"
args(listOf( args(listOf(inp, out))
"${project.extra["rootPath"]}/runelite-client/src/main/scripts",
"${project.extra["rootPath"]}/runelite-client/build/scripts/runelite"
))
}
register<JavaExec>("indexMojo") { doLast {
inputs.files( DOS(project.file("$out/index").outputStream().buffered(256)).use {
fileTree("${project.extra["rootPath"]}/runelite-client/build/scripts/runelite") project.fileTree(out) {
) exclude { it.path.endsWith(".hash") || it.name.equals("index") }
var lastDir = Int.MAX_VALUE
outputs.file("${project.extra["rootPath"]}/runelite-client/build/scripts/runelite/index"); visit {
if (this.isDirectory) lastDir = this.name.toInt().shl(16)
dependsOn("assembleMojo") else it.writeInt(lastDir.or(this.name.toInt()))
}
classpath = project.sourceSets.main.get().runtimeClasspath }
main = "net.runelite.script.IndexMojo" it.writeInt(-1)
args(listOf( }
"${project.extra["rootPath"]}/runelite-client/build/scripts/runelite", }
"${project.extra["rootPath"]}/runelite-client/build/scripts/runelite/index"
))
} }
} }

105
runelite-script-assembler-plugin/src/main/java/net/runelite/script/IndexMojo.java
View File

@@ -1,105 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.script;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import static java.lang.Integer.parseInt;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@Mojo(
name = "build-index",
defaultPhase = LifecyclePhase.GENERATE_RESOURCES
)
public class IndexMojo extends AbstractMojo
{
@Parameter(required = true)
private File archiveOverlayDirectory;
@Parameter(required = true)
private File indexFile;
private IndexMojo(File archiveOverlayDirectory, File indexFile)
{
this.archiveOverlayDirectory = archiveOverlayDirectory;
this.indexFile = indexFile;
}
public static void main(String[] args) throws Exception
{
if (args.length < 2)
{
throw new IllegalArgumentException("Usage: overlaydir indexfile");
}
File archiveOverlayDirectory = new File(args[0]);
File indexFile = new File(args[1]);
new IndexMojo(archiveOverlayDirectory, indexFile).execute();
}
@Override
public void execute() throws MojoExecutionException, MojoFailureException
{
try (DataOutputStream fout = new DataOutputStream(new FileOutputStream(indexFile)))
{
for (File indexFolder : archiveOverlayDirectory.listFiles())
{
if (indexFolder.isDirectory())
{
int indexId = parseInt(indexFolder.getName());
for (File archiveFile : indexFolder.listFiles())
{
int archiveId;
try
{
archiveId = parseInt(archiveFile.getName());
}
catch (NumberFormatException ex)
{
continue;
}
fout.writeInt(indexId << 16 | archiveId);
}
}
}
fout.writeInt(-1);
}
catch (IOException ex)
{
throw new MojoExecutionException("error building index file", ex);
}
}
}

7
settings.gradle.kts
View File

@@ -29,6 +29,13 @@ plugins {
id("com.gradle.enterprise").version("3.0") id("com.gradle.enterprise").version("3.0")
} }
gradleEnterprise {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = System.getenv("SCAN_TOS_ACCEPTED")?: "no"
}
}
include(":http-api") include(":http-api")
include(":cache") include(":cache")
include(":runelite-api") include(":runelite-api")