-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Decouple vgo-plugin from AGP versions (#91)
* Start decoupling AGP * Use the options class in the plugin * Add a changelog entry * Prepare 3.0 * Upgrade ktlint * Fix :vgo tests * Fix test compile issues * Fix cli tests * Fix the archive path * Automate associating binary with release * Avoid publishing the cli jar * Add a note about agp
- Loading branch information
Showing
55 changed files
with
899 additions
and
565 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| plugins { | ||
| id("org.jetbrains.kotlin.jvm") | ||
| } | ||
|
|
||
| tasks { | ||
| jar { | ||
| dependsOn(configurations.runtimeClasspath) | ||
| manifest { | ||
| attributes["Main-Class"] = "com.jzbrooks.vgo.cli.CommandLineInterface" | ||
| attributes["Bundle-Version"] = project.properties["VERSION_NAME"] | ||
| } | ||
|
|
||
| val sourceClasses = | ||
| sourceSets.main | ||
| .get() | ||
| .output.classesDirs | ||
| inputs.files(sourceClasses) | ||
| destinationDirectory.set(layout.buildDirectory.dir("libs/debug")) | ||
|
|
||
| doFirst { | ||
| from(files(sourceClasses)) | ||
| from( | ||
| configurations.runtimeClasspath | ||
| .get() | ||
| .asFileTree.files | ||
| .map(::zipTree), | ||
| ) | ||
|
|
||
| exclude( | ||
| "**/*.kotlin_metadata", | ||
| "**/*.kotlin_module", | ||
| "**/*.kotlin_builtins", | ||
| "**/module-info.class", | ||
| "META-INF/maven/**", | ||
| "META-INF/*.version", | ||
| "META-INF/LICENSE*", | ||
| "META-INF/LGPL2.1", | ||
| "META-INF/DEPENDENCIES", | ||
| "META-INF/AL2.0", | ||
| "META-INF/BCKEY.DSA", | ||
| "META-INF/BC2048KE.DSA", | ||
| "META-INF/BCKEY.SF", | ||
| "META-INF/BC2048KE.SF", | ||
| "**/NOTICE*", | ||
| "javax/activation/**", | ||
| "xsd/catalog.xml", | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| val optimize by registering(JavaExec::class) { | ||
| description = "Runs r8 on the jar application." | ||
| group = "build" | ||
|
|
||
| inputs.file("build/libs/debug/vgo-cli.jar") | ||
| outputs.file("build/libs/vgo.jar") | ||
|
|
||
| val javaHome = System.getProperty("java.home") | ||
|
|
||
| classpath(r8) | ||
| mainClass = "com.android.tools.r8.R8" | ||
|
|
||
| args( | ||
| "--release", | ||
| "--classfile", | ||
| "--lib", | ||
| javaHome, | ||
| "--output", | ||
| "build/libs/vgo.jar", | ||
| "--pg-conf", | ||
| "optimize.pro", | ||
| "build/libs/debug/vgo-cli.jar", | ||
| ) | ||
|
|
||
| dependsOn(getByName("jar")) | ||
| } | ||
|
|
||
| val binaryFileProp = layout.buildDirectory.file("libs/vgo") | ||
| val binary by registering { | ||
| description = "Prepends shell script in the jar to improve CLI" | ||
| group = "build" | ||
|
|
||
| dependsOn(optimize) | ||
|
|
||
| inputs.file("build/libs/vgo.jar") | ||
| outputs.file(binaryFileProp) | ||
|
|
||
| doLast { | ||
| val binaryFile = binaryFileProp.get().asFile | ||
| binaryFile.parentFile.mkdirs() | ||
| binaryFile.delete() | ||
| binaryFile.appendText("#!/bin/sh\n\nexec java \$JAVA_OPTS -jar \$0 \"\$@\"\n\n") | ||
| file("build/libs/vgo.jar").inputStream().use { binaryFile.appendBytes(it.readBytes()) } | ||
| binaryFile.setExecutable(true, false) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val r8: Configuration by configurations.creating | ||
|
|
||
| dependencies { | ||
| implementation(project(":vgo")) | ||
|
|
||
| implementation("com.android.tools:sdk-common:31.7.0") | ||
|
|
||
| r8("com.android.tools:r8:8.5.35") | ||
|
|
||
| testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1") | ||
| testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0") | ||
| testImplementation("org.junit.jupiter:junit-jupiter-params") | ||
| testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
vgo-cli/src/main/kotlin/com/jzbrooks/vgo/cli/CommandLineInterface.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.jzbrooks.vgo.cli | ||
|
|
||
| import com.jzbrooks.vgo.Vgo | ||
| import kotlin.system.exitProcess | ||
|
|
||
| class CommandLineInterface { | ||
| fun run(args: Array<String>): Int { | ||
| val argReader = ArgReader(args.toMutableList()) | ||
|
|
||
| val printHelp = argReader.readFlag("help|h") | ||
| if (printHelp) { | ||
| println(HELP_MESSAGE) | ||
| return 0 | ||
| } | ||
|
|
||
| val printVersion = argReader.readFlag("version|v") | ||
| val printStats = argReader.readFlag("stats|s") | ||
| val indent = argReader.readOption("indent")?.toIntOrNull() | ||
|
|
||
| val outputs = | ||
| run { | ||
| val outputPaths = mutableListOf<String>() | ||
| var output = argReader.readOption("output|o") | ||
| while (output != null) { | ||
| outputPaths.add(output) | ||
| output = argReader.readOption("output|o") | ||
| } | ||
| outputPaths.toList() | ||
| } | ||
|
|
||
| var format = argReader.readOption("format") | ||
|
|
||
| var inputs = argReader.readArguments() | ||
|
|
||
| val options = | ||
| Vgo.Options( | ||
| printVersion = printVersion, | ||
| printStats = printStats, | ||
| indent = indent, | ||
| output = outputs, | ||
| format = format, | ||
| input = inputs, | ||
| ) | ||
|
|
||
| return Vgo(options).run() | ||
| } | ||
|
|
||
| companion object { | ||
| private val HELP_MESSAGE = | ||
| """ | ||
| > vgo [options] [file/directory] | ||
| Options: | ||
| -h --help print this message | ||
| -o --output file or directory, if not provided the input will be overwritten | ||
| -s --stats print statistics on processed files to standard out | ||
| -v --version print the version number | ||
| --indent value write files with value columns of indentation | ||
| --format value output format (svg, vd, etc) | ||
| """.trimIndent() | ||
|
|
||
| @JvmStatic | ||
| fun main(args: Array<String>): Unit = exitProcess(CommandLineInterface().run(args)) | ||
| } | ||
| } |
Oops, something went wrong.