Updates ion-schema-schemas submodule and moves to resource directory (#…

…275)
amazon-ion · Jun 6, 2023 · cab3378 · cab3378
1 parent 70c75dc
commit cab3378
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,5 +2,5 @@
 	path = ion-schema-tests
 	url = https://github.com/amazon-ion/ion-schema-tests.git
 [submodule "ion-schema-schemas"]
-	path = ion-schema-schemas
+	path = ion-schema/src/main/resources/ion-schema-schemas
 	url = https://github.com/amazon-ion/ion-schema-schemas.git
diff --git a/ion-schema-schemas b/ion-schema-schemas
diff --git a/ion-schema/build.gradle b/ion-schema/build.gradle
@@ -37,12 +37,7 @@ dependencies {
 }
 
 processResources {
-  from('../ion-schema-schemas/isl/') {
-    into 'ion-schema-schemas/isl/'
-  }
-  from('../ion-schema-schemas/json/') {
-    into 'ion-schema-schemas/json/'
-  }
+  includes = ["ion-schema-schemas/**/*.isl"]
 }
 
 compileKotlin{

diff --git a/ion-schema/src/main/resources/ion-schema-schemas b/ion-schema/src/main/resources/ion-schema-schemas