diff --git a/.editorconfig b/.editorconfig
index fc783ea..432a069 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,10 @@
[*]
end_of_line = lf
insert_final_newline = true
+
+[*.kt]
ij_kotlin_imports_layout = *
ij_kotlin_packages_to_use_import_on_demand=com.amazon.ionelement.**
-[test/**.kt]
+[src/test/kotlin/**.kt]
ktlint_ignore_back_ticked_identifier=true
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..097f9f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat text eol=crlf
+
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 332624c..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-// Documentation for using Gradle with Kotlin is here: https://kotlinlang.org/docs/reference/using-gradle.html
-
-plugins {
- id 'java-library'
- id 'org.jetbrains.kotlin.jvm' version '1.6.20'
- id 'maven-publish'
- id 'signing'
- id 'org.jetbrains.dokka' version '1.6.20'
- id 'jacoco'
- id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.9.0'
- id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
-}
-
-group = "com.amazon.ion"
-version = "1.2.0"
-ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
-
-repositories {
- mavenCentral()
-}
-
-java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- jvmTarget = "1.8"
- apiVersion = "1.3"
- languageVersion = "1.4" // Can be read by 1.3 compiler, so consumers on kotlin 1.3 are still supported.
- freeCompilerArgs = [
- "-opt-in=kotlin.RequiresOptIn" // Using RequiresOptIn requires opt-in itself, at least in kotlin-1.4
- ]
- }
-}
-
-kotlin {
- explicitApi = 'strict'
-}
-
-dependencies {
- api 'com.amazon.ion:ion-java:[1.4.0,)'
- implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
- implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4'
-
- testImplementation 'org.jetbrains.kotlin:kotlin-test'
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
- testImplementation 'org.junit.jupiter:junit-jupiter-params:5.6.2'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
-}
-
-test {
- useJUnitPlatform()
- jacoco {
- destinationFile = file("${buildDir}/jacoco/test.exec")
- }
-}
-
-task sourcesJar(type: Jar) {
- from "src"
- archiveClassifier.set("sources")
-}
-
-task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
- classifier 'javadoc'
- from dokkaJavadoc.outputDirectory
-}
-
-java {
- sourceSets {
- main.java.srcDirs = ["src"]
- main.resources.srcDirs = ["resources"]
- test.java.srcDirs = ["test"]
- test.resources.srcDirs = ["test-resources"]
- }
-}
-
-
-jacocoTestReport {
- // Adjust the output of the test report
- reports {
- xml.enabled true
- csv.enabled false
- }
-}
-
-tasks.jacocoTestReport {
- dependsOn(tasks.test) // tests are required to run before generating the report
-}
-
-ktlint {
- version = "0.45.2"
- outputToConsole = true
-}
-
-plugins.withId('org.jetbrains.kotlin.jvm', { _ ->
- sourceSets {
- main.kotlin.srcDirs = ["src"]
- test.kotlin.srcDirs = ["test"]
- }
-})
-
-publishing {
- publications {
- maven(MavenPublication) {
- artifactId = "ion-element"
-
- from components.java
- artifact sourcesJar
- artifact javadocJar
-
- pom {
- name = "Ion Element Kotlin"
- packaging = "jar"
- url = "https://github.com/amzn/ion-element-kotlin"
- description = "An immutable in-memory representation of Amazon Ion for Kotlin"
- scm {
- connection = "scm:git@github.com:amzn/ion-element-kotlin.git"
- developerConnection = "scm:git@github.com:amzn/ion-element-kotlin.git"
- url = "git@github.com:amzn/ion-element-kotlin.git"
- }
- licenses {
- license {
- name = "The Apache License, Version 2.0"
- url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
- }
- }
- developers {
- developer {
- name = "Amazon Ion Team"
- email = "ion-team@amazon.com"
- organization = "Amazon Ion"
- organizationUrl = "https://github.com/amazon-ion"
- }
- }
- }
- }
- }
- repositories {
- maven {
- url "https://aws.oss.sonatype.org/service/local/staging/deploy/maven2"
- credentials {
- username ossrhUsername
- password ossrhPassword
- }
- }
- }
-}
-
-signing {
- // Allow publishing to maven local even if we don't have the signing keys
- // This works because when not required, the signing task will be skipped
- // if signing.keyId, signing.password, signing.secretKeyRingFile, etc are
- // not present in gradle.properties.
- required { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
- sign publishing.publications.maven
-}
-
-tasks.withType(Sign) {
- onlyIf { isReleaseVersion }
-}
-
-
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..46dc461
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,162 @@
+
+plugins {
+ id("java-library")
+
+ kotlin("jvm") version "1.6.20"
+ id("maven-publish")
+ id("signing")
+ id("org.jetbrains.dokka") version "1.6.20"
+ id("jacoco")
+ id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.9.0"
+ id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+
+ // TODO: Configure and use this
+ id("com.diffplug.spotless") version "6.11.0"
+}
+
+repositories {
+ // Use Maven Central for resolving dependencies.
+ mavenCentral()
+}
+
+group = "com.amazon.ion"
+version = "1.3.0-SNAPSHOT"
+description = "An immutable in-memory representation of Amazon Ion for Kotlin"
+
+val isCI: Boolean = System.getenv("CI") == "true"
+val githubRepositoryUrl = "https://github.com/amazon-ion/ion-element-kotlin/"
+val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
+
+dependencies {
+ api("com.amazon.ion:ion-java:[1.4.0,)")
+ compileOnly("com.amazon.ion:ion-java:1.4.0")
+ implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+ implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4")
+ testImplementation("org.jetbrains.kotlin:kotlin-test")
+ testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
+ testImplementation("org.junit.jupiter:junit-jupiter-params:5.6.2")
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+
+ // Use the Kotlin JUnit 5 integration.
+ testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+kotlin {
+ explicitApi()
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+lateinit var sourcesJar: AbstractArchiveTask
+lateinit var javadocJar: AbstractArchiveTask
+
+tasks {
+
+ compileKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ apiVersion = "1.3"
+ languageVersion = "1.4" // Can be read by 1.3 compiler, so consumers on kotlin 1.3 are still supported.
+ freeCompilerArgs = listOf(
+ "-opt-in=kotlin.RequiresOptIn" // Using RequiresOptIn requires opt-in itself, at least in kotlin-1.4
+ )
+ }
+ }
+
+ ktlint {
+ version.set("0.45.2")
+ outputToConsole.set(true)
+ }
+
+ sourcesJar = create<Jar>("sourcesJar") sourcesJar@{
+ archiveClassifier.set("sources")
+ from(sourceSets.named("main"))
+ }
+
+ javadocJar = create<Jar>("javadocJar") javadocJar@{
+ archiveClassifier.set("javadoc")
+ from(javadoc)
+ }
+
+ withType<Sign> {
+ setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask(":publish") }
+ }
+
+ test {
+ useJUnitPlatform()
+ // report is always generated after tests run
+ finalizedBy(jacocoTestReport)
+ }
+
+ jacocoTestReport {
+ dependsOn(test)
+ reports {
+ xml.required.set(true)
+ html.required.set(true)
+ }
+ doLast {
+ logger.quiet("Coverage report written to file://${reports.html.outputLocation.get()}/index.html")
+ }
+ }
+}
+
+publishing {
+ publications.create<MavenPublication>("ion-element") {
+ // from(components.java)
+ artifact(sourcesJar)
+ artifact(javadocJar)
+
+ pom {
+ name.set("Ion Element Kotlin")
+ description.set(project.description)
+ url.set(githubRepositoryUrl)
+ scm {
+ connection.set("scm:git:git@github.com:amazon-ion/ion-element-kotlin.git")
+ developerConnection.set("scm:git:git@github.com:amazon-ion/ion-element-kotlin.git")
+ url.set("git@github.com:amazon-ion/ion-element-kotlin.git")
+ }
+ licenses {
+ license {
+ name.set("The Apache License, Version 2.0")
+ url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+ }
+ }
+ developers {
+ developer {
+ name.set("Amazon Ion Team")
+ email.set("ion-team@amazon.com")
+ organization.set("Amazon Ion")
+ organizationUrl.set("https://github.com/amazon-ion")
+ }
+ }
+ }
+ }
+ repositories {
+ maven {
+ url = uri("https://aws.oss.sonatype.org/service/local/")
+ credentials {
+ username = properties["ossrhUsername"].toString()
+ password = properties["ossrhPassword"].toString()
+ }
+ }
+ }
+}
+
+signing {
+ // Allow publishing to maven local even if we don't have the signing keys
+ // This works because when not required, the signing task will be skipped
+ // if signing.keyId, signing.password, signing.secretKeyRingFile, etc are
+ // not present in gradle.properties.
+ isRequired = isReleaseVersion
+
+ if (isCI) {
+ val signingKeyId: String? by project
+ val signingKey: String? by project
+ val signingPassword: String? by project
+ useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 457aad0..d64cd49 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 2a98307..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Mon Mar 29 11:55:05 PDT 2021
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708f..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,127 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
##############################################################################
-##
-## 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"'
+# 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
+
# 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
@@ -81,92 +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" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; 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
# 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=$((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"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$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"'
+
+# 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 0f8d593..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,92 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-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.
-
-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%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+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"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+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
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+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
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+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!
+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
+
+:omega
diff --git a/src/com/amazon/ionelement/api/AnyElement.kt b/src/main/kotlin/com/amazon/ionelement/api/AnyElement.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/AnyElement.kt
rename to src/main/kotlin/com/amazon/ionelement/api/AnyElement.kt
diff --git a/src/com/amazon/ionelement/api/ByteArrayView.kt b/src/main/kotlin/com/amazon/ionelement/api/ByteArrayView.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/ByteArrayView.kt
rename to src/main/kotlin/com/amazon/ionelement/api/ByteArrayView.kt
diff --git a/src/com/amazon/ionelement/api/ElementType.kt b/src/main/kotlin/com/amazon/ionelement/api/ElementType.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/ElementType.kt
rename to src/main/kotlin/com/amazon/ionelement/api/ElementType.kt
diff --git a/src/com/amazon/ionelement/api/Equivalence.kt b/src/main/kotlin/com/amazon/ionelement/api/Equivalence.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/Equivalence.kt
rename to src/main/kotlin/com/amazon/ionelement/api/Equivalence.kt
diff --git a/src/com/amazon/ionelement/api/Ion.kt b/src/main/kotlin/com/amazon/ionelement/api/Ion.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/Ion.kt
rename to src/main/kotlin/com/amazon/ionelement/api/Ion.kt
diff --git a/src/com/amazon/ionelement/api/IonElement.kt b/src/main/kotlin/com/amazon/ionelement/api/IonElement.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonElement.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonElement.kt
diff --git a/src/com/amazon/ionelement/api/IonElementException.kt b/src/main/kotlin/com/amazon/ionelement/api/IonElementException.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonElementException.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonElementException.kt
diff --git a/src/com/amazon/ionelement/api/IonElementLoader.kt b/src/main/kotlin/com/amazon/ionelement/api/IonElementLoader.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonElementLoader.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonElementLoader.kt
diff --git a/src/com/amazon/ionelement/api/IonLocation.kt b/src/main/kotlin/com/amazon/ionelement/api/IonLocation.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonLocation.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonLocation.kt
diff --git a/src/com/amazon/ionelement/api/IonMeta.kt b/src/main/kotlin/com/amazon/ionelement/api/IonMeta.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonMeta.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonMeta.kt
diff --git a/src/com/amazon/ionelement/api/IonOperators.kt b/src/main/kotlin/com/amazon/ionelement/api/IonOperators.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonOperators.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonOperators.kt
diff --git a/src/com/amazon/ionelement/api/IonUtils.kt b/src/main/kotlin/com/amazon/ionelement/api/IonUtils.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/IonUtils.kt
rename to src/main/kotlin/com/amazon/ionelement/api/IonUtils.kt
diff --git a/src/com/amazon/ionelement/api/MutableStructFields.kt b/src/main/kotlin/com/amazon/ionelement/api/MutableStructFields.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/MutableStructFields.kt
rename to src/main/kotlin/com/amazon/ionelement/api/MutableStructFields.kt
diff --git a/src/com/amazon/ionelement/api/StructField.kt b/src/main/kotlin/com/amazon/ionelement/api/StructField.kt
similarity index 100%
rename from src/com/amazon/ionelement/api/StructField.kt
rename to src/main/kotlin/com/amazon/ionelement/api/StructField.kt
diff --git a/src/com/amazon/ionelement/impl/AnyElementBase.kt b/src/main/kotlin/com/amazon/ionelement/impl/AnyElementBase.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/AnyElementBase.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/AnyElementBase.kt
diff --git a/src/com/amazon/ionelement/impl/BigIntIntElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/BigIntIntElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/BigIntIntElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/BigIntIntElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/BlobElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/BlobElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/BlobElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/BlobElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/BoolElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/BoolElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/BoolElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/BoolElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/ByteArrayViewImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/ByteArrayViewImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/ByteArrayViewImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/ByteArrayViewImpl.kt
diff --git a/src/com/amazon/ionelement/impl/ClobElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/ClobElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/ClobElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/ClobElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/DecimalElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/DecimalElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/DecimalElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/DecimalElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/FloatElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/FloatElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/FloatElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/FloatElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/IonElementExtensions.kt b/src/main/kotlin/com/amazon/ionelement/impl/IonElementExtensions.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/IonElementExtensions.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/IonElementExtensions.kt
diff --git a/src/com/amazon/ionelement/impl/IonElementLoaderImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/IonElementLoaderImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/IonElementLoaderImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/IonElementLoaderImpl.kt
diff --git a/src/com/amazon/ionelement/impl/ListElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/ListElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/ListElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/ListElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/LobElementBase.kt b/src/main/kotlin/com/amazon/ionelement/impl/LobElementBase.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/LobElementBase.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/LobElementBase.kt
diff --git a/src/com/amazon/ionelement/impl/LongIntElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/LongIntElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/LongIntElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/LongIntElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/MutableStructFieldsImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/MutableStructFieldsImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/MutableStructFieldsImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/MutableStructFieldsImpl.kt
diff --git a/src/com/amazon/ionelement/impl/NullElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/NullElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/NullElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/NullElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/SeqElementBase.kt b/src/main/kotlin/com/amazon/ionelement/impl/SeqElementBase.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/SeqElementBase.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/SeqElementBase.kt
diff --git a/src/com/amazon/ionelement/impl/SexpElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/SexpElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/SexpElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/SexpElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/StringElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/StringElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/StringElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/StringElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/StructElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/StructElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/StructElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/StructElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/StructFieldImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/StructFieldImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/StructFieldImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/StructFieldImpl.kt
diff --git a/src/com/amazon/ionelement/impl/SymbolElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/SymbolElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/SymbolElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/SymbolElementImpl.kt
diff --git a/src/com/amazon/ionelement/impl/TextElementBase.kt b/src/main/kotlin/com/amazon/ionelement/impl/TextElementBase.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/TextElementBase.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/TextElementBase.kt
diff --git a/src/com/amazon/ionelement/impl/TimestampElementImpl.kt b/src/main/kotlin/com/amazon/ionelement/impl/TimestampElementImpl.kt
similarity index 100%
rename from src/com/amazon/ionelement/impl/TimestampElementImpl.kt
rename to src/main/kotlin/com/amazon/ionelement/impl/TimestampElementImpl.kt
diff --git a/test/com/amazon/ionelement/demos/java/ConstructionDemo.java b/src/test/java/com/amazon/ionelement/demos/ConstructionDemo.java
similarity index 100%
rename from test/com/amazon/ionelement/demos/java/ConstructionDemo.java
rename to src/test/java/com/amazon/ionelement/demos/ConstructionDemo.java
diff --git a/test/com/amazon/ionelement/demos/java/DemoBase.java b/src/test/java/com/amazon/ionelement/demos/DemoBase.java
similarity index 100%
rename from test/com/amazon/ionelement/demos/java/DemoBase.java
rename to src/test/java/com/amazon/ionelement/demos/DemoBase.java
diff --git a/test/com/amazon/ionelement/demos/java/ElementLoaderDemo.java b/src/test/java/com/amazon/ionelement/demos/ElementLoaderDemo.java
similarity index 100%
rename from test/com/amazon/ionelement/demos/java/ElementLoaderDemo.java
rename to src/test/java/com/amazon/ionelement/demos/ElementLoaderDemo.java
diff --git a/test/com/amazon/ionelement/demos/java/MutableStructFieldsDemo.java b/src/test/java/com/amazon/ionelement/demos/MutableStructFieldsDemo.java
similarity index 100%
rename from test/com/amazon/ionelement/demos/java/MutableStructFieldsDemo.java
rename to src/test/java/com/amazon/ionelement/demos/MutableStructFieldsDemo.java
diff --git a/test/com/amazon/ionelement/AnyElementTests.kt b/src/test/kotlin/com/amazon/ionelement/AnyElementTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/AnyElementTests.kt
rename to src/test/kotlin/com/amazon/ionelement/AnyElementTests.kt
diff --git a/test/com/amazon/ionelement/ComplianceTests.kt b/src/test/kotlin/com/amazon/ionelement/ComplianceTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/ComplianceTests.kt
rename to src/test/kotlin/com/amazon/ionelement/ComplianceTests.kt
diff --git a/test/com/amazon/ionelement/ConstructorTests.kt b/src/test/kotlin/com/amazon/ionelement/ConstructorTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/ConstructorTests.kt
rename to src/test/kotlin/com/amazon/ionelement/ConstructorTests.kt
diff --git a/test/com/amazon/ionelement/EquivTestCase.kt b/src/test/kotlin/com/amazon/ionelement/EquivTestCase.kt
similarity index 100%
rename from test/com/amazon/ionelement/EquivTestCase.kt
rename to src/test/kotlin/com/amazon/ionelement/EquivTestCase.kt
diff --git a/test/com/amazon/ionelement/EquivalenceTests.kt b/src/test/kotlin/com/amazon/ionelement/EquivalenceTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/EquivalenceTests.kt
rename to src/test/kotlin/com/amazon/ionelement/EquivalenceTests.kt
diff --git a/test/com/amazon/ionelement/ImmutabilityTests.java b/src/test/kotlin/com/amazon/ionelement/ImmutabilityTests.java
similarity index 100%
rename from test/com/amazon/ionelement/ImmutabilityTests.java
rename to src/test/kotlin/com/amazon/ionelement/ImmutabilityTests.java
diff --git a/test/com/amazon/ionelement/IonElementLoaderTests.kt b/src/test/kotlin/com/amazon/ionelement/IonElementLoaderTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/IonElementLoaderTests.kt
rename to src/test/kotlin/com/amazon/ionelement/IonElementLoaderTests.kt
diff --git a/test/com/amazon/ionelement/IonOperatorsTests.kt b/src/test/kotlin/com/amazon/ionelement/IonOperatorsTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/IonOperatorsTests.kt
rename to src/test/kotlin/com/amazon/ionelement/IonOperatorsTests.kt
diff --git a/test/com/amazon/ionelement/MutableStructFieldsTests.kt b/src/test/kotlin/com/amazon/ionelement/MutableStructFieldsTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/MutableStructFieldsTests.kt
rename to src/test/kotlin/com/amazon/ionelement/MutableStructFieldsTests.kt
diff --git a/test/com/amazon/ionelement/StructIonElementTests.kt b/src/test/kotlin/com/amazon/ionelement/StructIonElementTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/StructIonElementTests.kt
rename to src/test/kotlin/com/amazon/ionelement/StructIonElementTests.kt
diff --git a/test/com/amazon/ionelement/ToIonValueTests.kt b/src/test/kotlin/com/amazon/ionelement/ToIonValueTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/ToIonValueTests.kt
rename to src/test/kotlin/com/amazon/ionelement/ToIonValueTests.kt
diff --git a/test/com/amazon/ionelement/demos/kotlin/AnyElementAccessorsDemo.kt b/src/test/kotlin/com/amazon/ionelement/demos/AnyElementAccessorsDemo.kt
similarity index 100%
rename from test/com/amazon/ionelement/demos/kotlin/AnyElementAccessorsDemo.kt
rename to src/test/kotlin/com/amazon/ionelement/demos/AnyElementAccessorsDemo.kt
diff --git a/test/com/amazon/ionelement/demos/kotlin/MutableStructFieldsDemo.kt b/src/test/kotlin/com/amazon/ionelement/demos/MutableStructFieldsDemo.kt
similarity index 100%
rename from test/com/amazon/ionelement/demos/kotlin/MutableStructFieldsDemo.kt
rename to src/test/kotlin/com/amazon/ionelement/demos/MutableStructFieldsDemo.kt
diff --git a/test/com/amazon/ionelement/demos/kotlin/NarrowingDemo.kt b/src/test/kotlin/com/amazon/ionelement/demos/NarrowingDemo.kt
similarity index 100%
rename from test/com/amazon/ionelement/demos/kotlin/NarrowingDemo.kt
rename to src/test/kotlin/com/amazon/ionelement/demos/NarrowingDemo.kt
diff --git a/test/com/amazon/ionelement/demos/kotlin/UnexpectedTypesDemo.kt b/src/test/kotlin/com/amazon/ionelement/demos/UnexpectedTypesDemo.kt
similarity index 100%
rename from test/com/amazon/ionelement/demos/kotlin/UnexpectedTypesDemo.kt
rename to src/test/kotlin/com/amazon/ionelement/demos/UnexpectedTypesDemo.kt
diff --git a/test/com/amazon/ionelement/impl/IonElementExtensionsTests.kt b/src/test/kotlin/com/amazon/ionelement/impl/IonElementExtensionsTests.kt
similarity index 100%
rename from test/com/amazon/ionelement/impl/IonElementExtensionsTests.kt
rename to src/test/kotlin/com/amazon/ionelement/impl/IonElementExtensionsTests.kt
diff --git a/test/com/amazon/ionelement/util/ArgumentsProviderBase.kt b/src/test/kotlin/com/amazon/ionelement/util/ArgumentsProviderBase.kt
similarity index 100%
rename from test/com/amazon/ionelement/util/ArgumentsProviderBase.kt
rename to src/test/kotlin/com/amazon/ionelement/util/ArgumentsProviderBase.kt
diff --git a/test/com/amazon/ionelement/util/Constants.kt b/src/test/kotlin/com/amazon/ionelement/util/Constants.kt
similarity index 100%
rename from test/com/amazon/ionelement/util/Constants.kt
rename to src/test/kotlin/com/amazon/ionelement/util/Constants.kt
diff --git a/test/com/amazon/ionelement/util/IonElementLoaderTestCase.kt b/src/test/kotlin/com/amazon/ionelement/util/IonElementLoaderTestCase.kt
similarity index 100%
rename from test/com/amazon/ionelement/util/IonElementLoaderTestCase.kt
rename to src/test/kotlin/com/amazon/ionelement/util/IonElementLoaderTestCase.kt
diff --git a/test/com/amazon/ionelement/util/TestUtils.kt b/src/test/kotlin/com/amazon/ionelement/util/TestUtils.kt
similarity index 100%
rename from test/com/amazon/ionelement/util/TestUtils.kt
rename to src/test/kotlin/com/amazon/ionelement/util/TestUtils.kt
diff --git a/test/com/amazon/ionelement/util/randomElement.kt b/src/test/kotlin/com/amazon/ionelement/util/randomElement.kt
similarity index 100%
rename from test/com/amazon/ionelement/util/randomElement.kt
rename to src/test/kotlin/com/amazon/ionelement/util/randomElement.kt