Re-org "aggregate" and "collections" modules using new organizational…

… layout
xtclang · Jan 20, 2022 · 2199edb · 2199edb
1 parent 41f5c17
commit 2199edb
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 2 deletions.
diff --git a/lib_aggregate/src/main/x/module.x → lib_aggregate/src/main/x/aggregate.x b/lib_aggregate/src/main/x/module.x → lib_aggregate/src/main/x/aggregate.x
diff --git a/lib_aggregate/src/main/x/Average.x → lib_aggregate/src/main/x/aggregate/Average.x b/lib_aggregate/src/main/x/Average.x → lib_aggregate/src/main/x/aggregate/Average.x
diff --git a/lib_aggregate/src/main/x/Max.x → lib_aggregate/src/main/x/aggregate/Max.x b/lib_aggregate/src/main/x/Max.x → lib_aggregate/src/main/x/aggregate/Max.x
diff --git a/lib_aggregate/src/main/x/Min.x → lib_aggregate/src/main/x/aggregate/Min.x b/lib_aggregate/src/main/x/Min.x → lib_aggregate/src/main/x/aggregate/Min.x
diff --git a/lib_aggregate/src/main/x/MinMax.x → lib_aggregate/src/main/x/aggregate/MinMax.x b/lib_aggregate/src/main/x/MinMax.x → lib_aggregate/src/main/x/aggregate/MinMax.x
diff --git a/lib_aggregate/src/main/x/Sum.x → lib_aggregate/src/main/x/aggregate/Sum.x b/lib_aggregate/src/main/x/Sum.x → lib_aggregate/src/main/x/aggregate/Sum.x
diff --git a/lib_collections/src/main/x/module.x → lib_collections/src/main/x/collections.x b/lib_collections/src/main/x/module.x → lib_collections/src/main/x/collections.x
diff --git a/lib_collections/src/main/x/ArrayDeque.x → ...tions/src/main/x/collections/ArrayDeque.x b/lib_collections/src/main/x/ArrayDeque.x → ...tions/src/main/x/collections/ArrayDeque.x
diff --git a/lib_collections/src/main/x/ArrayOrderedSet.x → .../src/main/x/collections/ArrayOrderedSet.x b/lib_collections/src/main/x/ArrayOrderedSet.x → .../src/main/x/collections/ArrayOrderedSet.x
diff --git a/lib_collections/src/main/x/CircularArray.x → ...ns/src/main/x/collections/CircularArray.x b/lib_collections/src/main/x/CircularArray.x → ...ns/src/main/x/collections/CircularArray.x
diff --git a/...ollections/src/main/x/ConcurrentHashMap.x → ...rc/main/x/collections/ConcurrentHashMap.x b/...ollections/src/main/x/ConcurrentHashMap.x → ...rc/main/x/collections/ConcurrentHashMap.x
diff --git a/...lections/src/main/x/ConcurrentHasherMap.x → .../main/x/collections/ConcurrentHasherMap.x b/...lections/src/main/x/ConcurrentHasherMap.x → .../main/x/collections/ConcurrentHasherMap.x
diff --git a/lib_collections/src/main/x/SparseIntSet.x → ...ons/src/main/x/collections/SparseIntSet.x b/lib_collections/src/main/x/SparseIntSet.x → ...ons/src/main/x/collections/SparseIntSet.x
diff --git a/xdk/build.gradle.kts b/xdk/build.gradle.kts
@@ -99,7 +99,7 @@ val compileAggregate = tasks.register<JavaExec>("compileAggregate") {
             "-version", "$version",
             "-L", "$coreLib",
             "-L", "$bridgeLib",
-            "$aggregateMain/x/module.x")
+            "$aggregateMain/x/aggregate.x")
     mainClass.set("org.xvm.tool.Compiler")
 }
 
@@ -119,7 +119,7 @@ val compileCollections = tasks.register<JavaExec>("compileCollections") {
             "-version", "$version",
             "-L", "$coreLib",
             "-L", "$bridgeLib",
-            "$collectionsMain/x/module.x")
+            "$collectionsMain/x/collections.x")
     mainClass.set("org.xvm.tool.Compiler")
 }