moving from s.a.i to c.a.i (#113)

Also starts depending on c.a.i:ion-java
amazon-ion · May 14, 2019 · dcd9e79 · dcd9e79
1 parent e2b9ccb
commit dcd9e79
Show file tree

Hide file tree

Showing 75 changed files with 377 additions and 376 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@ A reference implementation of the [Ion Schema Specification](https://amzn.github
 written in Kotlin.
 
 [![Build Status](https://travis-ci.org/amzn/ion-schema-kotlin.svg)](https://travis-ci.org/amzn/ion-schema-kotlin)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-schema-kotlin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-schema-kotlin)
-[![Javadoc](https://javadoc-badge.appspot.com/software.amazon.ion/ion-schema-kotlin.svg?label=javadoc)](http://www.javadoc.io/doc/software.amazon.ion/ion-schema-kotlin)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-schema-kotlin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-schema-kotlin)
+[![Javadoc](https://javadoc-badge.appspot.com/com.amazon.ion/ion-schema-kotlin.svg?label=javadoc)](http://www.javadoc.io/doc/com.amazon.ion/ion-schema-kotlin)
 
 **This is currently alpha software and all aspects of it are subject
 to change.**
@@ -21,15 +21,15 @@ Before running, replace `<base_path>` with the path containing
 "/data/test".
 
 ```java
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ionschema.AuthorityFilesystem;
-import software.amazon.ionschema.IonSchemaSystem;
-import software.amazon.ionschema.IonSchemaSystemBuilder;
-import software.amazon.ionschema.Schema;
-import software.amazon.ionschema.Type;
-import software.amazon.ionschema.Violations;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ionschema.AuthorityFilesystem;
+import com.amazon.ionschema.IonSchemaSystem;
+import com.amazon.ionschema.IonSchemaSystemBuilder;
+import com.amazon.ionschema.Schema;
+import com.amazon.ionschema.Type;
+import com.amazon.ionschema.Violations;
 
 public class IonSchemaGettingStarted {
     private static IonSystem ION = IonSystemBuilder.standard().build();

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ plugins {
   id "signing"
 }
 
-group = "software.amazon.ion"
+group = "com.amazon.ion"
 version = "0.8.0-SNAPSHOT"
 ext.kotlin_version = "[1.3,)"
 
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-  api "software.amazon.ion:ion-java:[1.4,)"
+  api "com.amazon.ion:ion-java:[1.4,)"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
@@ -43,7 +43,7 @@ sourceSets {
 dokka {
   outputFormat = "html"
   outputDirectory = "$buildDir/javadoc"
-  includes = ["src/software/amazon/ionschema/module.md"]
+  includes = ["src/com/amazon/ionschema/module.md"]
 }
 
 task sourcesJar(type: Jar) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon May 13 17:33:55 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
diff --git a/src/software/amazon/ionschema/Authority.kt → src/com/amazon/ionschema/Authority.kt b/src/software/amazon/ionschema/Authority.kt → src/com/amazon/ionschema/Authority.kt
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.util.CloseableIterator
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.util.CloseableIterator
 
 /**
  * An Authority is responsible for resolving a particular class of

diff --git a/...e/amazon/ionschema/AuthorityFilesystem.kt → ...m/amazon/ionschema/AuthorityFilesystem.kt b/...e/amazon/ionschema/AuthorityFilesystem.kt → ...m/amazon/ionschema/AuthorityFilesystem.kt
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.internal.IonSchemaSystemImpl
-import software.amazon.ionschema.util.CloseableIterator
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.internal.IonSchemaSystemImpl
+import com.amazon.ionschema.util.CloseableIterator
 import java.io.File
 import java.io.FileReader
 import java.io.Reader

diff --git a/...mazon/ionschema/InvalidSchemaException.kt → ...mazon/ionschema/InvalidSchemaException.kt b/...mazon/ionschema/InvalidSchemaException.kt → ...mazon/ionschema/InvalidSchemaException.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
 /**
  * Thrown when an invalid schema definition is encountered.

diff --git a/...re/amazon/ionschema/IonSchemaException.kt → ...om/amazon/ionschema/IonSchemaException.kt b/...re/amazon/ionschema/IonSchemaException.kt → ...om/amazon/ionschema/IonSchemaException.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
 /**
  * The top-level Ion Schema exception.

diff --git a/...tware/amazon/ionschema/IonSchemaSystem.kt → src/com/amazon/ionschema/IonSchemaSystem.kt b/...tware/amazon/ionschema/IonSchemaSystem.kt → src/com/amazon/ionschema/IonSchemaSystem.kt
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonValue
+import com.amazon.ion.IonValue
 
 /**
  * Provides methods for instantiating instances of [Schema].

diff --git a/...mazon/ionschema/IonSchemaSystemBuilder.kt → ...mazon/ionschema/IonSchemaSystemBuilder.kt b/...mazon/ionschema/IonSchemaSystemBuilder.kt → ...mazon/ionschema/IonSchemaSystemBuilder.kt
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonSystem
-import software.amazon.ion.system.IonSystemBuilder
-import software.amazon.ionschema.internal.ConstraintFactoryDefault
-import software.amazon.ionschema.internal.IonSchemaSystemImpl
+import com.amazon.ion.IonSystem
+import com.amazon.ion.system.IonSystemBuilder
+import com.amazon.ionschema.internal.ConstraintFactoryDefault
+import com.amazon.ionschema.internal.IonSchemaSystemImpl
 
 /**
  * Entry point for Ion Schema.  Provides a builder API for constructing

diff --git a/src/software/amazon/ionschema/Schema.kt → src/com/amazon/ionschema/Schema.kt b/src/software/amazon/ionschema/Schema.kt → src/com/amazon/ionschema/Schema.kt
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonStruct
+import com.amazon.ion.IonStruct
 
 /**
  * A Schema is a collection of zero or more [Type]s.

diff --git a/src/software/amazon/ionschema/Type.kt → src/com/amazon/ionschema/Type.kt b/src/software/amazon/ionschema/Type.kt → src/com/amazon/ionschema/Type.kt
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.internal.Constraint
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.internal.Constraint
 
 /**
  * A Type consists of an optional name and zero or more constraints.

diff --git a/src/software/amazon/ionschema/Violations.kt → src/com/amazon/ionschema/Violations.kt b/src/software/amazon/ionschema/Violations.kt → src/com/amazon/ionschema/Violations.kt
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema
+package com.amazon.ionschema
 
-import software.amazon.ion.IonStruct
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.internal.util.truncate
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.internal.util.truncate
 
 /**
  * Indicates whether a value validated successfully against a [Type],

diff --git a/...on/ionschema/internal/CommonViolations.kt → ...on/ionschema/internal/CommonViolations.kt b/...on/ionschema/internal/CommonViolations.kt → ...on/ionschema/internal/CommonViolations.kt
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Violation
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Violation
 
 /**
  * Provides methods to create Violations that are common across multiple

diff --git a/...e/amazon/ionschema/internal/Constraint.kt → ...m/amazon/ionschema/internal/Constraint.kt b/...e/amazon/ionschema/internal/Constraint.kt → ...m/amazon/ionschema/internal/Constraint.kt
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Violations
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Violations
 
 /**
  * Represents a single constraint.

diff --git a/...n/ionschema/internal/ConstraintFactory.kt → ...n/ionschema/internal/ConstraintFactory.kt b/...n/ionschema/internal/ConstraintFactory.kt → ...n/ionschema/internal/ConstraintFactory.kt
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Schema
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Schema
 
 /**
  * Factory for [Constraint] objects.

diff --git a/...hema/internal/ConstraintFactoryDefault.kt → ...hema/internal/ConstraintFactoryDefault.kt b/...hema/internal/ConstraintFactoryDefault.kt → ...hema/internal/ConstraintFactoryDefault.kt
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Schema
-import software.amazon.ionschema.internal.constraint.*
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Schema
+import com.amazon.ionschema.internal.constraint.*
 
 /**
  * Default [ConstraintFactory] implementation.

diff --git a/...ionschema/internal/IonSchemaSystemImpl.kt → ...ionschema/internal/IonSchemaSystemImpl.kt b/...ionschema/internal/IonSchemaSystemImpl.kt → ...ionschema/internal/IonSchemaSystemImpl.kt
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonSystem
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Authority
-import software.amazon.ionschema.IonSchemaException
-import software.amazon.ionschema.IonSchemaSystem
-import software.amazon.ionschema.Schema
+import com.amazon.ion.IonSystem
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Authority
+import com.amazon.ionschema.IonSchemaException
+import com.amazon.ionschema.IonSchemaSystem
+import com.amazon.ionschema.Schema
 
 /**
  * Implementation of [IonSchemaSystem].

diff --git a/...e/amazon/ionschema/internal/SchemaCore.kt → ...m/amazon/ionschema/internal/SchemaCore.kt b/...e/amazon/ionschema/internal/SchemaCore.kt → ...m/amazon/ionschema/internal/SchemaCore.kt
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.*
-import software.amazon.ionschema.IonSchemaSystem
-import software.amazon.ionschema.Schema
-import software.amazon.ionschema.Type
+import com.amazon.ion.*
+import com.amazon.ionschema.IonSchemaSystem
+import com.amazon.ionschema.Schema
+import com.amazon.ionschema.Type
 
 /**
  * Provides instances of [Type] for all of the Core Types and Ion Types

diff --git a/...e/amazon/ionschema/internal/SchemaImpl.kt → ...m/amazon/ionschema/internal/SchemaImpl.kt b/...e/amazon/ionschema/internal/SchemaImpl.kt → ...m/amazon/ionschema/internal/SchemaImpl.kt
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
-
-import software.amazon.ion.IonList
-import software.amazon.ion.IonString
-import software.amazon.ion.IonStruct
-import software.amazon.ion.IonSymbol
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.EMPTY_ITERATOR
-import software.amazon.ionschema.InvalidSchemaException
-import software.amazon.ionschema.Schema
-import software.amazon.ionschema.Type
+package com.amazon.ionschema.internal
+
+import com.amazon.ion.IonList
+import com.amazon.ion.IonString
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonSymbol
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.EMPTY_ITERATOR
+import com.amazon.ionschema.InvalidSchemaException
+import com.amazon.ionschema.Schema
+import com.amazon.ionschema.Type
 
 /**
  * Implementation of [Schema] for all user-provided ISL.

diff --git a/.../amazon/ionschema/internal/TypeBuiltin.kt → .../amazon/ionschema/internal/TypeBuiltin.kt b/.../amazon/ionschema/internal/TypeBuiltin.kt → .../amazon/ionschema/internal/TypeBuiltin.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
 /**
  * Marker interface for the non-scalar and non-container types defined

diff --git a/...zon/ionschema/internal/TypeBuiltinImpl.kt → ...zon/ionschema/internal/TypeBuiltinImpl.kt b/...zon/ionschema/internal/TypeBuiltinImpl.kt → ...zon/ionschema/internal/TypeBuiltinImpl.kt
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonStruct
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.Schema
-import software.amazon.ionschema.Violation
-import software.amazon.ionschema.Violations
-import software.amazon.ionschema.internal.constraint.ConstraintBase
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.Schema
+import com.amazon.ionschema.Violation
+import com.amazon.ionschema.Violations
+import com.amazon.ionschema.internal.constraint.ConstraintBase
 
 /**
  * Type implementation instantiated to represent built-in types.

diff --git a/...are/amazon/ionschema/internal/TypeCore.kt → ...com/amazon/ionschema/internal/TypeCore.kt b/...are/amazon/ionschema/internal/TypeCore.kt → ...com/amazon/ionschema/internal/TypeCore.kt
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.IonSymbol
-import software.amazon.ion.IonType
-import software.amazon.ion.IonValue
-import software.amazon.ionschema.internal.constraint.ConstraintBase
-import software.amazon.ionschema.Violations
-import software.amazon.ionschema.Violation
+import com.amazon.ion.IonSymbol
+import com.amazon.ion.IonType
+import com.amazon.ion.IonValue
+import com.amazon.ionschema.internal.constraint.ConstraintBase
+import com.amazon.ionschema.Violations
+import com.amazon.ionschema.Violation
 
 /**
  * Instantiated to represent individual Core Types as defined by the

diff --git a/...are/amazon/ionschema/internal/TypeImpl.kt → ...com/amazon/ionschema/internal/TypeImpl.kt b/...are/amazon/ionschema/internal/TypeImpl.kt → ...com/amazon/ionschema/internal/TypeImpl.kt
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.ionschema.internal
+package com.amazon.ionschema.internal
 
-import software.amazon.ion.*
-import software.amazon.ion.system.IonSystemBuilder
-import software.amazon.ionschema.Schema
-import software.amazon.ionschema.internal.constraint.ConstraintBase
-import software.amazon.ionschema.Violations
+import com.amazon.ion.*
+import com.amazon.ion.system.IonSystemBuilder
+import com.amazon.ionschema.Schema
+import com.amazon.ionschema.internal.constraint.ConstraintBase
+import com.amazon.ionschema.Violations
 
 /**
  * Implementation of [Type] backed by a collection of zero or more [Constraint]s.