diff --git a/android/benchmark/build.gradle b/android/benchmark/build.gradle deleted file mode 100644 index ffb0391..0000000 --- a/android/benchmark/build.gradle +++ /dev/null @@ -1,46 +0,0 @@ -apply plugin: "com.android.library" -apply plugin: "org.jetbrains.kotlin.android" -apply plugin: "androidx.benchmark" - -android { - compileSdkVersion 29 - - defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - sourceSets { - findByName("androidTest")?.java?.srcDirs("src/androidTest/kotlin") - findByName("main")?.java?.srcDirs("src/main/kotlin") - } - packagingOptions { - exclude 'META-INF/*.kotlin_module' - } - buildTypes { - release { - signingConfig signingConfigs.debug - } - } -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = "1.8" - } -} - -dependencies { - androidTestImplementation "com.google.guava:guava:27.1-jre" - androidTestImplementation "com.squareup.okio:okio:2.4.3" - androidTestImplementation "androidx.benchmark:benchmark-junit4:1.0.0" - androidTestImplementation "junit:junit:4.12" - androidTestImplementation "androidx.test:runner:1.2.0" - androidTestImplementation "androidx.test:rules:1.2.0" - androidTestImplementation "androidx.test.ext:junit:1.1.1" - implementation project(":models") - androidTestImplementation configurations.getByName("implementation") -} \ No newline at end of file diff --git a/android/benchmark/src/androidTest/AndroidManifest.xml b/android/benchmark/src/androidTest/AndroidManifest.xml deleted file mode 100644 index 435a52e..0000000 --- a/android/benchmark/src/androidTest/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/benchmark/src/main/AndroidManifest.xml b/android/benchmark/src/main/AndroidManifest.xml deleted file mode 100644 index a8a918e..0000000 --- a/android/benchmark/src/main/AndroidManifest.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - \ No newline at end of file diff --git a/androidBenchmark/.gitignore b/androidBenchmark/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/androidBenchmark/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/androidBenchmark/benchmark-proguard-rules.pro b/androidBenchmark/benchmark-proguard-rules.pro new file mode 100644 index 0000000..e4061d2 --- /dev/null +++ b/androidBenchmark/benchmark-proguard-rules.pro @@ -0,0 +1,37 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile + +-dontobfuscate + +-ignorewarnings + +-keepattributes *Annotation* + +-dontnote junit.framework.** +-dontnote junit.runner.** + +-dontwarn androidx.test.** +-dontwarn org.junit.** +-dontwarn org.hamcrest.** +-dontwarn com.squareup.javawriter.JavaWriter + +-keepclasseswithmembers @org.junit.runner.RunWith public class * \ No newline at end of file diff --git a/androidBenchmark/build.gradle b/androidBenchmark/build.gradle new file mode 100644 index 0000000..d41f592 --- /dev/null +++ b/androidBenchmark/build.gradle @@ -0,0 +1,54 @@ +plugins { + id "com.android.library" + id "androidx.benchmark" + id "org.jetbrains.kotlin.android" +} + +android { + namespace "dev.zacsweers.jsonserialization.android" + compileSdk 33 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + + defaultConfig { + minSdk 24 + targetSdk 33 + + testInstrumentationRunner "androidx.benchmark.junit4.AndroidBenchmarkRunner" + } + + testBuildType = "release" + buildTypes { + debug { + // Since debuggable can"t be modified by gradle for library modules, + // it must be done in a manifest - see src/androidTest/AndroidManifest.xml + minifyEnabled true + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro" + } + release { + isDefault = true + } + } +} + +configurations { + androidTest.extendsFrom(implementation) +} + +dependencies { + androidTestImplementation "com.google.guava:guava:31.1-jre" + androidTestImplementation "com.squareup.okio:okio:3.3.0" + androidTestImplementation "androidx.benchmark:benchmark-junit4:1.1.1" + androidTestImplementation "junit:junit:4.13.2" + androidTestImplementation "androidx.test:runner:1.5.2" + androidTestImplementation "androidx.test:rules:1.5.0" + androidTestImplementation "androidx.test.ext:junit:1.1.5" + implementation project(":models") +} diff --git a/androidBenchmark/src/androidTest/AndroidManifest.xml b/androidBenchmark/src/androidTest/AndroidManifest.xml new file mode 100644 index 0000000..26d1f2d --- /dev/null +++ b/androidBenchmark/src/androidTest/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/android/benchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidBenchmark.kt b/androidBenchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidBenchmark.kt similarity index 100% rename from android/benchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidBenchmark.kt rename to androidBenchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidBenchmark.kt diff --git a/android/benchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidPolymorphicBenchmark.kt b/androidBenchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidPolymorphicBenchmark.kt similarity index 100% rename from android/benchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidPolymorphicBenchmark.kt rename to androidBenchmark/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidPolymorphicBenchmark.kt diff --git a/androidBenchmark/src/main/AndroidManifest.xml b/androidBenchmark/src/main/AndroidManifest.xml new file mode 100644 index 0000000..568741e --- /dev/null +++ b/androidBenchmark/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt b/androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt similarity index 98% rename from android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt rename to androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt index 8801c73..a6b6ddb 100644 --- a/android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt +++ b/androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt @@ -85,11 +85,11 @@ private fun printResults(type: ResultType, results: List) { } val output = buildString { - appendln() + appendLine() append(type.description) - appendln(':') - appendln() - appendln("```") + appendLine(':') + appendLine() + appendLine("```") groupedResults.entries .joinTo(this, "\n\n", postfix = "\n```") { (grouping, matchedAnalyses) -> val content = matchedAnalyses.sortedBy { it.score } @@ -161,4 +161,4 @@ internal data class Analysis( } internal operator fun List.component6(): T = this[5] -internal operator fun List.component7(): T = this[6] \ No newline at end of file +internal operator fun List.component7(): T = this[6] diff --git a/android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt b/androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt similarity index 97% rename from android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt rename to androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt index d7c3f13..57c2903 100644 --- a/android/benchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt +++ b/androidBenchmark/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt @@ -51,11 +51,11 @@ private fun printResults(type: PolymorphicResultType, results: List) { } val output = buildString { - appendln() + appendLine() append(type.description) - appendln(':') - appendln() - appendln("```") + appendLine(':') + appendLine() + appendLine("```") groupedResults.entries .joinTo(this, "\n\n", postfix = "\n```") { (grouping, matchedAnalyses) -> val content = matchedAnalyses.sortedBy { it.score } diff --git a/build.gradle b/build.gradle index ab9ed2f..8b704ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,23 @@ -ext.kotlin_version = '1.4.10' -ext.serialization_version = '1.0.0' -ext.jmh_version = '1.22' +ext.kotlin_version = "1.8.10" +ext.serialization_version = "1.5.0-RC" +ext.jmh_version = "1.36" buildscript { - ext.kotlin_version = '1.4.10' - ext.serialization_version = '1.0.0' - ext.jmh_version = '1.22' + ext.kotlin_version = "1.8.10" + ext.serialization_version = "1.5.0-RC" + ext.jmh_version = "1.36" repositories { google() mavenCentral() - maven { - url "https://plugins.gradle.org/m2/" - } - maven { url "https://kotlin.bintray.com/kotlinx" } - jcenter() + gradlePluginPortal() } dependencies { - classpath "com.android.tools.build:gradle:3.6.0" - classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" - classpath "net.ltgt.gradle:gradle-apt-plugin:0.21" + classpath "com.android.tools.build:gradle:7.4.0" + classpath "me.champeau.jmh:jmh-gradle-plugin:0.6.6" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "com.github.jengelman.gradle.plugins:shadow:5.2.0" - classpath "androidx.benchmark:benchmark-gradle-plugin:1.0.0" +// classpath "gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.1.2" + classpath "androidx.benchmark:benchmark-gradle-plugin:1.1.1" } } @@ -30,8 +25,6 @@ subprojects { repositories { google() mavenCentral() - jcenter() - maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 5bac8ac..8fa73a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,10 @@ +org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true android.useAndroidX=true +android.enableJetifier=false +kotlin.code.style=official +org.gradle.vfs.watch=true +org.gradle.unsafe.configuration-cache=true +kotlin.incremental.useClasspathSnapshot=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..249e583 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 1ba7206..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7..a69d9cb 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,78 +17,113 @@ # ############################################################################## -## -## 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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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"' # 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 + # Determine the Java command to use to start the JVM. 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 @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -105,79 +140,101 @@ location of your Java installation." 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*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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. +# -# 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" +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 9618d8d..f127cfd 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,10 +25,13 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,38 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :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/jmh/build.gradle b/jmh/build.gradle index 162e249..70821fa 100644 --- a/jmh/build.gradle +++ b/jmh/build.gradle @@ -1,7 +1,7 @@ -apply plugin: 'java' -apply plugin: 'org.jetbrains.kotlin.jvm' -apply plugin: "me.champeau.gradle.jmh" -apply plugin: "com.github.johnrengelman.shadow" +apply plugin: "java" +apply plugin: "org.jetbrains.kotlin.jvm" +apply plugin: "me.champeau.jmh" +//apply plugin: "com.github.johnrengelman.shadow" sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -14,14 +14,14 @@ jmh { jmhVersion = jmh_version if (project.hasProperty("jmh")) { - include = [".*" + project.jmh + ".*"] - println("JMH: " + include) + includes = [".*" + project.jmh + ".*"] + println("JMH: " + includes) } } dependencies { - jmh 'com.google.guava:guava:27.1-jre' -// jmh 'com.squareup.okio:okio:2.2.1' + jmh "com.google.guava:guava:31.1-jre" +// jmh "com.squareup.okio:okio:2.2.1" implementation "org.openjdk.jmh:jmh-core:$jmh_version" implementation project(":models") } diff --git a/jmh/src/main/kotlin/dev/zacsweers/jsonserialization/jmh/DataParser.kt b/jmh/src/main/kotlin/dev/zacsweers/jsonserialization/jmh/DataParser.kt index 48872e2..2b29e77 100644 --- a/jmh/src/main/kotlin/dev/zacsweers/jsonserialization/jmh/DataParser.kt +++ b/jmh/src/main/kotlin/dev/zacsweers/jsonserialization/jmh/DataParser.kt @@ -77,10 +77,10 @@ JmhBenchmark.moshi_reflective_string_toJson false thrpt 25 15 } private fun printResults(type: ResultType, results: List) { - val groupedResults = type.groupings.associate { grouping -> - grouping to results.filter { - grouping.matchFunction(it.benchmark) - } + val groupedResults = type.groupings.associateWith { grouping -> + results.filter { + grouping.matchFunction(it.benchmark) + } } val benchmarkLength = results.maxBy { it.benchmark.length }!!.benchmark.length val scoreLength = results.maxBy { it.score.toString().length }!!.score.toString().length @@ -91,17 +91,23 @@ private fun printResults(type: ResultType, results: List) { } val output = buildString { - appendln() - append(type.description) - appendln(':') - appendln() - appendln("```") - groupedResults.entries - .joinTo(this, "\n\n", postfix = "\n```") { (grouping, matchedAnalyses) -> - val content = matchedAnalyses.sortedByDescending { it.score } - .joinToString("\n") { it.formattedString(benchmarkLength, scoreLength, errorLength) } - "${grouping.name}\n$content" - } + appendLine() + append(type.description) + appendLine(':') + appendLine() + appendLine("```") + groupedResults.entries + .joinTo(this, "\n\n", postfix = "\n```") { (grouping, matchedAnalyses) -> + val content = matchedAnalyses.sortedByDescending { it.score } + .joinToString("\n") { + it.formattedString( + benchmarkLength, + scoreLength, + errorLength + ) + } + "${grouping.name}\n$content" + } } println(output) diff --git a/models/build.gradle b/models/build.gradle index 1f669ec..9364c2f 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -1,9 +1,8 @@ -apply plugin: 'java-library' -apply plugin: 'org.jetbrains.kotlin.jvm' -apply plugin: 'org.jetbrains.kotlin.kapt' -apply plugin: 'kotlinx-serialization' -apply plugin: 'idea' -apply plugin: "net.ltgt.apt-idea" +apply plugin: "java-library" +apply plugin: "org.jetbrains.kotlin.jvm" +apply plugin: "org.jetbrains.kotlin.kapt" +apply plugin: "kotlinx-serialization" +apply plugin: "idea" sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -15,24 +14,23 @@ compileKotlin { } dependencies { - kapt 'com.google.auto.value:auto-value-annotations:1.7' - kapt 'com.google.auto.value:auto-value:1.7' - kapt 'com.ryanharter.auto.value:auto-value-gson:1.2.0' - kapt 'com.ryanharter.auto.value:auto-value-moshi:0.4.7' - kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.2' + kapt "com.google.auto.value:auto-value-annotations:1.10.1" + kapt "com.google.auto.value:auto-value:1.10.1" + kapt "com.ryanharter.auto.value:auto-value-gson:1.3.1" + kapt "com.ryanharter.auto.value:auto-value-moshi:0.4.7" + kapt "com.squareup.moshi:moshi-kotlin-codegen:1.14.0" - compileOnly 'com.google.auto.value:auto-value-annotations:1.7' - compileOnly 'com.ryanharter.auto.value:auto-value-moshi-annotations:0.4.7' + compileOnly "com.google.auto.value:auto-value-annotations:1.10.1" + compileOnly "com.ryanharter.auto.value:auto-value-moshi-annotations:1.0.0" - implementation 'com.ryanharter.auto.value:auto-value-gson-runtime:1.2.0' - implementation 'com.google.auto.value:auto-value-annotations:1.7' - api 'com.google.guava:guava:27.1-jre' - api 'com.squareup.moshi:moshi-kotlin:1.9.2' - api 'com.squareup.okio:okio:2.4.3' - api 'com.squareup.moshi:moshi:1.9.2' - api 'com.squareup.moshi:moshi-adapters:1.9.2' - api 'com.google.code.gson:gson:2.8.6' + implementation "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1" + implementation "com.google.auto.value:auto-value-annotations:1.10.1" + api "com.google.guava:guava:31.1-jre" + api "com.squareup.moshi:moshi-kotlin:1.14.0" + api "com.squareup.okio:okio:3.3.0" + api "com.squareup.moshi:moshi:1.14.0" + api "com.squareup.moshi:moshi-adapters:1.14.0" + api "com.google.code.gson:gson:2.10.1" api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version" } diff --git a/settings.gradle b/settings.gradle index ee2f70b..d90569f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'benchmark' include ':jmh' include ':models' -include ':android:benchmark' +include ':androidBenchmark'