diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..c1e65380 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: Build + +on: + pull_request: + push: + branches: + - master + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 21 + - uses: gradle/actions/setup-gradle@v4 + - run: ./gradlew build + - uses: actions/upload-artifact@v4 + if: matrix.os == 'ubuntu-latest' + with: + name: svg2compose-binary + path: build/libs/svg2compose-*-binary.jar + if-no-files-found: error \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 548b4f6a..b5853895 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,35 +1,41 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { - kotlin("jvm") version "1.5.21" + kotlin("jvm") version "2.0.0" + id("com.github.gmazzo.buildconfig") version "5.4.0" id("maven-publish") } group = "br.com.devsrsouza" version = "0.7.0" +description = "Converts SVG or Android Vector Drawable to Compose code." +val baseName = "svg2compose" -repositories { - mavenCentral() - maven("https://maven.google.com") - maven("https://jetbrains.bintray.com/trove4j") -} +val r8: Configuration by configurations.creating dependencies { - implementation("com.google.guava:guava:23.0") - implementation("com.android.tools:sdk-common:27.2.0-alpha16") - implementation("com.android.tools:common:27.2.0-alpha16") - implementation("com.squareup:kotlinpoet:1.9.0") + implementation("com.google.guava:guava:33.2.1-jre") + implementation("com.android.tools:sdk-common:31.5.1") + implementation("com.android.tools:common:31.5.1") + implementation("com.squareup:kotlinpoet:1.18.1") implementation("org.ogce:xpp3:1.1.6") + implementation("com.github.ajalt.clikt:clikt:4.4.0") testImplementation(kotlin("test-junit")) + + r8("com.android.tools:r8:8.3.37") } tasks.test { useJUnit() } -tasks.withType() { - kotlinOptions.jvmTarget = "1.8" +java { + toolchain.languageVersion = JavaLanguageVersion.of(11) +} + +buildConfig { + buildConfigField("VERSION_NAME", version.toString()) + buildConfigField("DESCRIPTION", description) + packageName = "br.com.devsrsouza.svg2compose" } publishing { @@ -39,3 +45,100 @@ publishing { } } } + +tasks.withType().configureEach { + archiveBaseName = baseName + archiveVersion = version.toString() + + manifest { + attributes["Main-Class"] = "br.com.devsrsouza.svg2compose.MainKt" + attributes["Implementation-Version"] = version.toString() + } +} + +val fatJar by tasks.registering(Jar::class) { + dependsOn(configurations.runtimeClasspath) + dependsOn(tasks.jar) + + from(sourceSets.main.map { it.output.classesDirs + it.output.resourcesDir }) + from(configurations.runtimeClasspath.map { it.asFileTree.files.map(::zipTree) }) + + archiveClassifier = "fat" + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + exclude( + "**/*.kotlin_metadata", + "**/*.kotlin_builtins", + "**/*.kotlin_module", + "**/module-info.class", + "assets/**", + "font_metrics.properties", + "META-INF/AL2.0", + "META-INF/DEPENDENCIES", + "META-INF/jdom-info.xml", + "META-INF/LGPL2.1", + "META-INF/maven/**", + "META-INF/native-image/**", + "META-INF/proguard/**", + "META-INF/*.version", + "META-INF/*.SF", + "META-INF/*.DSA", + "META-INF/*.RSA", + "**/*.proto", + "**/*.dex", + "**/LICENSE**", + "**/NOTICE**", + "r8-version.properties", + "migrateToAndroidx/*", + "xsd/catalog.xml", + ) +} + +val r8File = layout.buildDirectory.file("libs/$baseName-$version-r8.jar").map { it.asFile } +val rulesFile = project.file("src/main/proguard-rules.pro") +val r8Jar by tasks.registering(JavaExec::class) { + dependsOn(fatJar) + + val fatJarFile = fatJar.get().archiveFile + inputs.file(fatJarFile) + inputs.file(rulesFile) + outputs.file(r8File) + + classpath(r8) + mainClass = "com.android.tools.r8.R8" + args( + "--release", + "--classfile", + "--output", r8File.get().path, + "--pg-conf", rulesFile.path, + "--lib", System.getProperty("java.home"), + fatJarFile.get().toString(), + ) +} + +val binaryFile = layout.buildDirectory.file("libs/$baseName-$version-binary.jar").map { it.asFile } +val binaryJar by tasks.registering(Task::class) { + dependsOn(r8Jar) + + val r8FileProvider = layout.file(r8File) + val binaryFileProvider = layout.file(binaryFile) + inputs.files(r8FileProvider) + outputs.file(binaryFileProvider) + + doLast { + val r8File = r8FileProvider.get().asFile + val binaryFile = binaryFileProvider.get().asFile + + binaryFile.parentFile.mkdirs() + binaryFile.delete() + binaryFile.writeText("#!/bin/sh\n\nexec java \$JAVA_OPTS -jar \$0 \"\$@\"\n\n") + binaryFile.appendBytes(r8File.readBytes()) + + binaryFile.setExecutable(true, false) + } +} + +tasks.assemble { + dependsOn(binaryJar) +} diff --git a/gradle.properties b/gradle.properties index 7fc6f1ff..d83ff79a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,5 @@ kotlin.code.style=official + +org.gradle.caching=true +org.gradle.jvmargs=-Dfile.encoding=UTF-8 +org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..d64cd491 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de6..09523c0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..7101f8e4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..9e144a3e --- /dev/null +++ b/renovate.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ], + "packageRules": [ + { + "groupName": "AGP", + "matchPackagePatterns": [ + "com.android.tools.*" + ] + } + ] +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 6cec84dc..a84c9699 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,9 @@ +dependencyResolutionManagement { + repositories { + mavenCentral() + google() + } +} rootProject.name = "svg-to-compose" diff --git a/src/main/kotlin/br/com/devsrsouza/svg2compose/Main.kt b/src/main/kotlin/br/com/devsrsouza/svg2compose/Main.kt new file mode 100644 index 00000000..ddd1460e --- /dev/null +++ b/src/main/kotlin/br/com/devsrsouza/svg2compose/Main.kt @@ -0,0 +1,90 @@ +package br.com.devsrsouza.svg2compose + +import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.ParameterHolder +import com.github.ajalt.clikt.parameters.arguments.argument +import com.github.ajalt.clikt.parameters.options.* +import java.nio.file.Paths +import java.util.* + +fun main(vararg args: String) = Svg2ComposeCommand().main(args.toList()) + +private class Svg2ComposeCommand : CliktCommand( + help = BuildConfig.DESCRIPTION, +) { + private val inputVectorsPath by argument( + "input-vectors-path", + help = "The directory containing the SVG files to be converted." + ) + private val outputSourcePath by argument( + "output-source-path", + help = "The output directory of the generated source code." + ) + + private val applicationIconPackage by stringOption( + "--application-icon-package", + help = "Represents what will be the final package of the generated Vector Source.", + default = "com.example" + ) + private val accessorName by stringOption( + "--accessor-name", + help = "The name will be usage to access the Vector in the code like `MyIconPack.IconName` or `MyIconPack.IconGroupDir.IconName`", + default = "Icons" + ) + private val allAssetsPropertyName by stringOption( + "--all-assets-property-name", + help = "The name of the property that will contain all assets.", + default = "AllIcons" + ) + private val generatePreview by generatePreview() + private val vectorType by vectorType() + + init { + versionOption(BuildConfig.VERSION_NAME, names = setOf("-v", "--version")) + } + + override fun run() { + Svg2Compose.parse( + applicationIconPackage = applicationIconPackage, + accessorName = accessorName, + outputSourceDirectory = Paths.get(outputSourcePath).toFile(), + vectorsDirectory = Paths.get(inputVectorsPath).toFile(), + type = vectorType, + allAssetsPropertyName = allAssetsPropertyName, + generatePreview = generatePreview + ) + } + + private fun ParameterHolder.stringOption( + vararg names: String, + help: String, + default: String + ): OptionWithValues { + return option(names = names, help = help).default(default) + } + + private fun ParameterHolder.generatePreview(): OptionWithValues { + return option( + "--generate-preview", + help = "Whether to generate @Preview of the icons. Use 'true' or 'false'." + ).convert { arg -> + when (arg.lowercase(Locale.US)) { + "true" -> true + "false" -> false + else -> throw IllegalArgumentException("Invalid value for --generate-preview. Use 'true' or 'false'.") + } + }.default(true) + } + + private fun ParameterHolder.vectorType(): OptionWithValues { + return option("--vector-type", help = "The type of the vector to be generated. Use 'svg' or 'drawable'.") + .convert { arg -> + when (arg.lowercase(Locale.US)) { + "svg" -> VectorType.SVG + "drawable" -> VectorType.DRAWABLE + else -> throw IllegalArgumentException("Invalid value for --vector-type. Use 'svg' or 'drawable'.") + } + } + .default(VectorType.SVG) + } +} \ No newline at end of file diff --git a/src/main/kotlin/br/com/devsrsouza/svg2compose/Svg2Compose.kt b/src/main/kotlin/br/com/devsrsouza/svg2compose/Svg2Compose.kt index b489c094..e32c7a90 100644 --- a/src/main/kotlin/br/com/devsrsouza/svg2compose/Svg2Compose.kt +++ b/src/main/kotlin/br/com/devsrsouza/svg2compose/Svg2Compose.kt @@ -66,7 +66,7 @@ object Svg2Compose { val parsedFile = File(drawableDir, "${iconName}.xml") parsedFile.parentFile.mkdirs() - Svg2Vector.parseSvgToXml(it, parsedFile.outputStream()) + Svg2Vector.parseSvgToXml(it.toPath(), parsedFile.outputStream()) it to parsedFile }.toList() @@ -88,6 +88,7 @@ object Svg2Compose { icons.values, groupClassName, iconsPackage, + generatePreview, ) val memberNames = writer.generateTo(outputSourceDirectory) { true } @@ -168,4 +169,4 @@ private fun GeneratedGroup.asParsingResult(): ParsingResult = ParsingResult( groupName = groupName, generatedIconsMemberNames = generatedIconsMemberNames, generatedGroups = childGroups.map { it.asParsingResult() }, -) \ No newline at end of file +) diff --git a/src/main/proguard-rules.pro b/src/main/proguard-rules.pro new file mode 100644 index 00000000..c5e80649 --- /dev/null +++ b/src/main/proguard-rules.pro @@ -0,0 +1,15 @@ +-allowaccessmodification +-dontobfuscate +-keepattributes SourceFile, LineNumberTable + +-keep class br.com.devsrsouza.svg2compose.MainKt { + public static void main(java.lang.String[]); +} + +-dontwarn com.google.j2objc.annotations.** +-dontwarn org.graalvm.nativeimage.** +-dontwarn org.graalvm.word.** +-dontwarn com.oracle.svm.core.annotate.** + +# TODO: it should be possible to keep less classes under this package. +-keep class org.xmlpull.**