Updates jar classifiers and r8 config

popematt · May 30, 2023 · de52d69 · de52d69
1 parent 98ce1c9
commit de52d69
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -70,6 +70,10 @@ tasks {
         // In Java 9+ we can use `release` but for now we're still building with JDK 8, 11
     }
 
+    jar {
+        archiveClassifier.set("original")
+    }
+
     shadowJar {
         relocate("kotlin", "com.amazon.ion_.shaded.kotlin")
         minimize()
@@ -80,7 +84,7 @@ tasks {
 
         inputs.file("build/libs/ion-java-$version-all.jar")
         inputs.file(rules)
-        outputs.file("build/libs/ion-java-$version-r8.jar")
+        outputs.file("build/libs/ion-java-$version.jar")
 
         dependsOn(shadowJar)
         dependsOn(configurations.runtimeClasspath)
@@ -90,7 +94,7 @@ tasks {
         args = listOf(
             "--release",
             "--classfile",
-            "--output", "build/libs/ion-java-$version-minified.jar",
+            "--output", "build/libs/ion-java-$version.jar",
             "--pg-conf", rules.toString(),
             "--lib", System.getProperty("java.home").toString(),
             "build/libs/ion-java-$version-all.jar",

diff --git a/config/r8/rules.txt b/config/r8/rules.txt
@@ -1,6 +1,9 @@
--keepattributes SourceFile, LineNumberTable
-
--keep class com.amazon.ion.***
--keep interface com.amazon.ion.***
--keep enum com.amazon.ion.***
+-dontobfuscate
+-keepattributes SourceFile, LineNumberTable, Signature
+-keepclasseswithmembers class com.amazon.ion.*** {
+   *;
+}
+-keep public class com.amazon.ion.***
+-keep public interface com.amazon.ion.***
+-keep public enum com.amazon.ion.***
 -keeppackagenames ***
diff --git a/src/com/amazon/ion/IonExtensions.kt b/src/com/amazon/ion/IonExtensions.kt
@@ -91,7 +91,7 @@ fun IonValue.childValuesOrNull(): List<IonValue>? = (this as? IonSequence)?.take
 /**
  * Returns the fields of an [IonStruct] or `null` if this [IonValue] is another type or an Ion null.
  */
-fun IonValue.fieldsOrNull(): List<Pair<String, IonValue>>? = (this as? IonStruct)?.takeIf { !it.isNullValue }?.map { it.fieldName to it }
+fun IonValue.fieldsOrNull(): List<IonValue>? = (this as? IonStruct)?.takeIf { !it.isNullValue }?.toList()
 
 /**
  * If this [IonValue] is a container type, returns an iterator over the contained values. Otherwise returns an iterator