Replace *toTypedArray() with plus operator

master
Graham 5 years ago
parent 7db0c971ee
commit c16b8b30af
  1. 8
      bundler/src/main/java/dev/openrs2/bundler/Bundler.kt

@ -31,7 +31,7 @@ fun main() {
@Singleton @Singleton
class Bundler @Inject constructor(publicKeyTransformer: PublicKeyTransformer) { class Bundler @Inject constructor(publicKeyTransformer: PublicKeyTransformer) {
private val transformers = listOf(*TRANSFORMERS.toTypedArray(), publicKeyTransformer) private val transformers = TRANSFORMERS + publicKeyTransformer
fun run(input: Path, output: Path, keyStorePath: Path) { fun run(input: Path, output: Path, keyStorePath: Path) {
// read input jars/packs // read input jars/packs
@ -110,10 +110,8 @@ class Bundler @Inject constructor(publicKeyTransformer: PublicKeyTransformer) {
glClientPack, glClientPack,
glClientJs5, glClientJs5,
glPack, glPack,
glJs5, glJs5
*glNatives.flatten().toTypedArray(), ) + glNatives.flatten() + miscNatives
*miscNatives.toTypedArray()
)
for (resource in resources) { for (resource in resources) {
resource.write(output) resource.write(output)
} }

Loading…
Cancel
Save