From f484d7a105534fd0fa2a8c79a2b83a30a2d432f2 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Fri, 26 Aug 2022 19:47:37 +0300 Subject: [PATCH 01/13] Updated Gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1ba7206..ae04661 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.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 6982fa22f0493e2a5e4e17ebbaf9f1b09b765969 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Fri, 26 Aug 2022 19:47:54 +0300 Subject: [PATCH 02/13] Updated dependencies --- android/benchmark/build.gradle | 36 +++++++++++++++------------------- build.gradle | 31 ++++++++++++----------------- jmh/build.gradle | 14 ++++++------- models/build.gradle | 34 +++++++++++++++----------------- 4 files changed, 51 insertions(+), 64 deletions(-) diff --git a/android/benchmark/build.gradle b/android/benchmark/build.gradle index ffb0391..c6c8120 100644 --- a/android/benchmark/build.gradle +++ b/android/benchmark/build.gradle @@ -3,23 +3,19 @@ apply plugin: "org.jetbrains.kotlin.android" apply plugin: "androidx.benchmark" android { - compileSdkVersion 29 + compileSdkVersion 33 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' + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } +// +// packagingOptions { +// exclude 'META-INF/*.kotlin_module' +// } buildTypes { release { signingConfig signingConfigs.debug @@ -29,18 +25,18 @@ android { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } 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" + androidTestImplementation 'com.google.guava:guava:31.1-jre' + androidTestImplementation "com.squareup.okio:okio:3.2.0" + androidTestImplementation "androidx.benchmark:benchmark-junit4:1.1.0" + androidTestImplementation "junit:junit:4.13.2" + androidTestImplementation "androidx.test:runner:1.4.0" + androidTestImplementation "androidx.test:rules:1.4.0" + androidTestImplementation "androidx.test.ext:junit:1.1.3" implementation project(":models") androidTestImplementation configurations.getByName("implementation") -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index ab9ed2f..476bb25 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.7.10" +ext.serialization_version = '1.4.0' +ext.jmh_version = "1.35" buildscript { - ext.kotlin_version = '1.4.10' - ext.serialization_version = '1.0.0' - ext.jmh_version = '1.22' + ext.kotlin_version = "1.7.10" + ext.serialization_version = "1.4.0" + ext.jmh_version = "1.22" 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-alpha09" + 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.0" } } @@ -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/jmh/build.gradle b/jmh/build.gradle index 162e249..f0c82cb 100644 --- a/jmh/build.gradle +++ b/jmh/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'java' apply plugin: 'org.jetbrains.kotlin.jvm' -apply plugin: "me.champeau.gradle.jmh" -apply plugin: "com.github.johnrengelman.shadow" +apply plugin: "me.champeau.jmh" +//apply plugin: "com.github.johnrengelman.shadow" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 // We setup jmh such that you must provide the `-Pjmh` to specify which tests // to run. If it has no value then all tests are run, but you can specify @@ -14,13 +14,13 @@ 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.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/models/build.gradle b/models/build.gradle index 1f669ec..ab649e2 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -3,10 +3,9 @@ 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" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 compileKotlin { kotlinOptions { @@ -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.google.auto.value:auto-value-annotations:1.9' + kapt 'com.google.auto.value:auto-value:1.9' + 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.9.2' + kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.13.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.9' + 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.9' + api 'com.google.guava:guava:31.1-jre' + api 'com.squareup.moshi:moshi-kotlin:1.13.0' + api 'com.squareup.okio:okio:3.2.0' + api 'com.squareup.moshi:moshi:1.13.0' + api 'com.squareup.moshi:moshi-adapters:1.13.0' + api 'com.google.code.gson:gson:2.9.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" } From 6a7f27bd90b09011f6e8f1ef34c2fa07818b9888 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Fri, 26 Aug 2022 19:48:44 +0300 Subject: [PATCH 03/13] Useful Gradle options added --- gradle.properties | 9 +++++++++ 1 file changed, 9 insertions(+) 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 From e7bd59aa31c6fa9e4555714f9a30cabf8ba9f036 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Fri, 26 Aug 2022 20:17:48 +0300 Subject: [PATCH 04/13] Extracted Android benchmark on the top level due to Studio failed to detect androidTest --- android/benchmark/build.gradle | 42 --------------- .../src/androidTest/AndroidManifest.xml | 28 ---------- .../benchmark/src/main/AndroidManifest.xml | 20 ------- androidBenchmark/.gitignore | 1 + androidBenchmark/benchmark-proguard-rules.pro | 37 +++++++++++++ androidBenchmark/build.gradle | 52 +++++++++++++++++++ .../src/androidTest/AndroidManifest.xml | 15 ++++++ .../android/AndroidBenchmark.kt | 0 .../android/AndroidPolymorphicBenchmark.kt | 0 androidBenchmark/src/main/AndroidManifest.xml | 2 + .../jsonserialization/android/DataParser.kt | 10 ++-- .../android/PolymorphicDataParser.kt | 8 +-- settings.gradle | 2 +- 13 files changed, 117 insertions(+), 100 deletions(-) delete mode 100644 android/benchmark/build.gradle delete mode 100644 android/benchmark/src/androidTest/AndroidManifest.xml delete mode 100644 android/benchmark/src/main/AndroidManifest.xml create mode 100644 androidBenchmark/.gitignore create mode 100644 androidBenchmark/benchmark-proguard-rules.pro create mode 100644 androidBenchmark/build.gradle create mode 100644 androidBenchmark/src/androidTest/AndroidManifest.xml rename {android/benchmark => androidBenchmark}/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidBenchmark.kt (100%) rename {android/benchmark => androidBenchmark}/src/androidTest/kotlin/dev/zacsweers/jsonserialization/android/AndroidPolymorphicBenchmark.kt (100%) create mode 100644 androidBenchmark/src/main/AndroidManifest.xml rename {android/benchmark => androidBenchmark}/src/main/kotlin/dev/zacsweers/jsonserialization/android/DataParser.kt (98%) rename {android/benchmark => androidBenchmark}/src/main/kotlin/dev/zacsweers/jsonserialization/android/PolymorphicDataParser.kt (97%) diff --git a/android/benchmark/build.gradle b/android/benchmark/build.gradle deleted file mode 100644 index c6c8120..0000000 --- a/android/benchmark/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -apply plugin: "com.android.library" -apply plugin: "org.jetbrains.kotlin.android" -apply plugin: "androidx.benchmark" - -android { - compileSdkVersion 33 - - defaultConfig { - minSdkVersion 21 - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } -// -// packagingOptions { -// exclude 'META-INF/*.kotlin_module' -// } - buildTypes { - release { - signingConfig signingConfigs.debug - } - } -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = "11" - } -} - -dependencies { - androidTestImplementation 'com.google.guava:guava:31.1-jre' - androidTestImplementation "com.squareup.okio:okio:3.2.0" - androidTestImplementation "androidx.benchmark:benchmark-junit4:1.1.0" - androidTestImplementation "junit:junit:4.13.2" - androidTestImplementation "androidx.test:runner:1.4.0" - androidTestImplementation "androidx.test:rules:1.4.0" - androidTestImplementation "androidx.test.ext:junit:1.1.3" - implementation project(":models") - androidTestImplementation configurations.getByName("implementation") -} 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..da41bab --- /dev/null +++ b/androidBenchmark/build.gradle @@ -0,0 +1,52 @@ +plugins { + id 'com.android.library' + id 'androidx.benchmark' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'dev.zacsweers.jsonserialization.android' + compileSdk 32 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + + defaultConfig { + minSdk 24 + targetSdk 32 + + 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 + } + } +} + +dependencies { + androidTestImplementation 'com.google.guava:guava:31.1-jre' + androidTestImplementation "com.squareup.okio:okio:3.2.0" + androidTestImplementation "androidx.benchmark:benchmark-junit4:1.1.0" + androidTestImplementation "junit:junit:4.13.2" + androidTestImplementation "androidx.test:runner:1.4.0" + androidTestImplementation "androidx.test:rules:1.4.0" + androidTestImplementation "androidx.test.ext:junit:1.1.3" + implementation project(":models") + androidTestImplementation configurations.getByName("implementation") + +} 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/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' From 8143b5fa96618c2ea26ecf716ce2ee13559f99fc Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:55:07 +0300 Subject: [PATCH 05/13] Updated AGP --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 476bb25..c8c1cc0 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath "com.android.tools.build:gradle:7.4.0-alpha09" + classpath 'com.android.tools.build:gradle:7.4.0-alpha10' 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" From b20294964cea4194839bafa5d35a8a859904853c Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:55:17 +0300 Subject: [PATCH 06/13] Fixed deprecation --- androidBenchmark/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/androidBenchmark/build.gradle b/androidBenchmark/build.gradle index da41bab..b33ac25 100644 --- a/androidBenchmark/build.gradle +++ b/androidBenchmark/build.gradle @@ -38,6 +38,10 @@ android { } } +configurations { + androidTest.extendsFrom(implementation) +} + dependencies { androidTestImplementation 'com.google.guava:guava:31.1-jre' androidTestImplementation "com.squareup.okio:okio:3.2.0" @@ -47,6 +51,4 @@ dependencies { androidTestImplementation "androidx.test:rules:1.4.0" androidTestImplementation "androidx.test.ext:junit:1.1.3" implementation project(":models") - androidTestImplementation configurations.getByName("implementation") - } From dbebcada34145ab8fabf2762821b4aa6633719bb Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:55:58 +0300 Subject: [PATCH 07/13] Updated target SDK --- androidBenchmark/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidBenchmark/build.gradle b/androidBenchmark/build.gradle index b33ac25..9dd6eaa 100644 --- a/androidBenchmark/build.gradle +++ b/androidBenchmark/build.gradle @@ -6,7 +6,7 @@ plugins { android { namespace 'dev.zacsweers.jsonserialization.android' - compileSdk 32 + compileSdk 33 compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -19,7 +19,7 @@ android { defaultConfig { minSdk 24 - targetSdk 32 + targetSdk 33 testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner' } From ff6835b97c6c818733a03d03aec447b5b47c8004 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:59:15 +0300 Subject: [PATCH 08/13] Downgrade compatibility version to Java 8 --- jmh/build.gradle | 4 ++-- models/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jmh/build.gradle b/jmh/build.gradle index f0c82cb..99e2f1a 100644 --- a/jmh/build.gradle +++ b/jmh/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: "me.champeau.jmh" //apply plugin: "com.github.johnrengelman.shadow" -sourceCompatibility = 11 -targetCompatibility = 11 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 // We setup jmh such that you must provide the `-Pjmh` to specify which tests // to run. If it has no value then all tests are run, but you can specify diff --git a/models/build.gradle b/models/build.gradle index ab649e2..5186722 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -4,8 +4,8 @@ apply plugin: 'org.jetbrains.kotlin.kapt' apply plugin: 'kotlinx-serialization' apply plugin: 'idea' -sourceCompatibility = 11 -targetCompatibility = 11 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 compileKotlin { kotlinOptions { From a8b1d82a78002dadbbc7f117c7e85e0e60f133c0 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:53:38 +0200 Subject: [PATCH 09/13] Updated dependencies --- androidBenchmark/build.gradle | 10 +++++----- build.gradle | 16 ++++++++-------- models/build.gradle | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/androidBenchmark/build.gradle b/androidBenchmark/build.gradle index 9dd6eaa..f4d6689 100644 --- a/androidBenchmark/build.gradle +++ b/androidBenchmark/build.gradle @@ -44,11 +44,11 @@ configurations { dependencies { androidTestImplementation 'com.google.guava:guava:31.1-jre' - androidTestImplementation "com.squareup.okio:okio:3.2.0" - androidTestImplementation "androidx.benchmark:benchmark-junit4:1.1.0" + 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.4.0" - androidTestImplementation "androidx.test:rules:1.4.0" - androidTestImplementation "androidx.test.ext:junit:1.1.3" + 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/build.gradle b/build.gradle index c8c1cc0..8bd5a8e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,23 @@ -ext.kotlin_version = "1.7.10" -ext.serialization_version = '1.4.0' -ext.jmh_version = "1.35" +ext.kotlin_version = "1.7.22" +ext.serialization_version = '1.5.0-RC' +ext.jmh_version = '1.36' buildscript { - ext.kotlin_version = "1.7.10" - ext.serialization_version = "1.4.0" - ext.jmh_version = "1.22" + ext.kotlin_version = "1.7.22" + ext.serialization_version = "1.5.0-RC" + ext.jmh_version = "1.36" repositories { google() mavenCentral() gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0-alpha10' + 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 "gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.1.2" - classpath "androidx.benchmark:benchmark-gradle-plugin:1.1.0" + classpath "androidx.benchmark:benchmark-gradle-plugin:1.1.1" } } diff --git a/models/build.gradle b/models/build.gradle index 5186722..9924a8f 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -14,23 +14,23 @@ compileKotlin { } dependencies { - kapt 'com.google.auto.value:auto-value-annotations:1.9' - kapt 'com.google.auto.value:auto-value:1.9' + 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.13.0' + kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.14.0' - compileOnly 'com.google.auto.value:auto-value-annotations:1.9' + 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.3.1' - implementation 'com.google.auto.value:auto-value-annotations:1.9' + 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.13.0' - api 'com.squareup.okio:okio:3.2.0' - api 'com.squareup.moshi:moshi:1.13.0' - api 'com.squareup.moshi:moshi-adapters:1.13.0' - api 'com.google.code.gson:gson:2.9.1' + 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.kotlinx:kotlinx-serialization-json:$serialization_version" } From 0b524022d0b5d949c2f23f5265c481d9ce7371a7 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:56:39 +0200 Subject: [PATCH 10/13] Replaced ' with " in build scripts --- androidBenchmark/build.gradle | 22 +++++++++---------- build.gradle | 6 +++--- jmh/build.gradle | 8 +++---- models/build.gradle | 40 +++++++++++++++++------------------ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/androidBenchmark/build.gradle b/androidBenchmark/build.gradle index f4d6689..d41f592 100644 --- a/androidBenchmark/build.gradle +++ b/androidBenchmark/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'com.android.library' - id 'androidx.benchmark' - id 'org.jetbrains.kotlin.android' + id "com.android.library" + id "androidx.benchmark" + id "org.jetbrains.kotlin.android" } android { - namespace 'dev.zacsweers.jsonserialization.android' + namespace "dev.zacsweers.jsonserialization.android" compileSdk 33 compileOptions { @@ -21,7 +21,7 @@ android { minSdk 24 targetSdk 33 - testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner' + testInstrumentationRunner "androidx.benchmark.junit4.AndroidBenchmarkRunner" } testBuildType = "release" @@ -43,12 +43,12 @@ configurations { } 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 "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' + 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/build.gradle b/build.gradle index 8bd5a8e..a62da51 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ ext.kotlin_version = "1.7.22" -ext.serialization_version = '1.5.0-RC' -ext.jmh_version = '1.36' +ext.serialization_version = "1.5.0-RC" +ext.jmh_version = "1.36" buildscript { ext.kotlin_version = "1.7.22" @@ -12,7 +12,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + 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" diff --git a/jmh/build.gradle b/jmh/build.gradle index 99e2f1a..70821fa 100644 --- a/jmh/build.gradle +++ b/jmh/build.gradle @@ -1,5 +1,5 @@ -apply plugin: 'java' -apply plugin: 'org.jetbrains.kotlin.jvm' +apply plugin: "java" +apply plugin: "org.jetbrains.kotlin.jvm" apply plugin: "me.champeau.jmh" //apply plugin: "com.github.johnrengelman.shadow" @@ -20,8 +20,8 @@ jmh { } dependencies { - jmh 'com.google.guava:guava:31.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/models/build.gradle b/models/build.gradle index 9924a8f..9364c2f 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -1,8 +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: "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 @@ -14,23 +14,23 @@ compileKotlin { } dependencies { - 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' + 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.10.1' - compileOnly 'com.ryanharter.auto.value:auto-value-moshi-annotations:1.0.0' + 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.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' + 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.kotlinx:kotlinx-serialization-json:$serialization_version" } From 1a45a6a4499a35c28427da1c10cab75542d394d9 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:59:33 +0200 Subject: [PATCH 11/13] Fixed deprecations in data parser --- .../jsonserialization/jmh/DataParser.kt | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) 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) From 3a49951ae1ba742bed1b2a31af1e572737664c6e Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Tue, 31 Jan 2023 23:00:35 +0200 Subject: [PATCH 12/13] Updated Gradle --- gradle/wrapper/gradle-wrapper.jar | Bin 58702 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 263 ++++++++++++++--------- gradlew.bat | 37 ++-- 4 files changed, 175 insertions(+), 127 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 25742 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 delta 23617 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..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-7.5.1-bin.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 From e3b947de32da1f69026798348eebe4b9540ad771 Mon Sep 17 00:00:00 2001 From: Andrey Mukamolov <4471821+fobo66@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:29:19 +0200 Subject: [PATCH 13/13] Updated Kotlin --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a62da51..8b704ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ -ext.kotlin_version = "1.7.22" +ext.kotlin_version = "1.8.10" ext.serialization_version = "1.5.0-RC" ext.jmh_version = "1.36" buildscript { - ext.kotlin_version = "1.7.22" + ext.kotlin_version = "1.8.10" ext.serialization_version = "1.5.0-RC" ext.jmh_version = "1.36" repositories {