More banging head against Gradle walls

LICENSE.md

@@ -1,14 +1,34 @@
 # License Information #
 
-The license for all source code (defined as ./bin/, ./resource/, ./src, ./tests, and ./xsrc) is Apache 2.0, unless explicitly noted. We chose Apache 2.0 for its compatibility with almost every reasonable use, and its compatibility with almost every license, reasonable or otherwise.
-
-The license for documentation (defined as ./doc/, and the embedded markdown API documentation and/or derivative forms thereof) is Creative Commons CC-BY-4.0, unless explicitly noted.
-
-To help ensure clean IP (which will help us keep this project free and open source), pull requests require a signed contributor agreement to be submitted in advance. We use the Apache contributor model agreements (modified to identify this specific project), which are located under the ./license directory. Contributors are required to sign and submit an Ecstasy Project Individual Contributor License Agreement (ICLA), or be a named employee on an Ecstasy Project Corporate Contributor License Agreement (CCLA), both derived directly from the Apache agreements of the same name.
-
-The Ecstasy name is a trademark owned and administered by The Ecstasy Project. Unlicensed use of the Ecstasy trademark is prohibited and will constitute infringement.
-
-All content of the project not covered by the above terms is probably an accident that we need to be made aware of, and remains (c) The Ecstasy Project, all rights reserved.
+The license for all source code (including all Java and
+Ecstasy source code in the project) is Apache 2.0, unless
+explicitly noted. We chose Apache 2.0 for its compatibility
+with almost every reasonable use, and its compatibility
+with almost every license, reasonable or otherwise.
+
+The license for documentationds (including the wiki and any
+embedded API documentation and/or derivative forms thereof)
+is Creative Commons CC-BY-4.0, unless explicitly noted.
+
+To help ensure clean IP (which will help us keep this
+project free and open source), pull requests require a
+signed contributor agreement to be submitted in advance.
+We use the Apache contributor model agreements (modified
+to identify this specific project), which are located under
+the ./license directory. Contributors are required to sign
+and submit an Ecstasy Project Individual Contributor
+License Agreement (ICLA), or be a named employee on an
+Ecstasy Project Corporate Contributor License Agreement
+(CCLA), both derived directly from the Apache agreements
+of the same name.
+
+The Ecstasy name is a trademark owned and administered by
+The Ecstasy Project. Unlicensed use of the Ecstasy trademark
+is prohibited and will constitute infringement.
+
+All content of the project not covered by the above terms
+is probably an accident that we need to be made aware of,
+and remains (c) The Ecstasy Project, all rights reserved.
 
 ## Apache 2.0
 
@@ -615,4 +635,8 @@ All content of the project not covered by the above terms is probably an acciden
 
 ## Questions?
 
-To submit a contributor agreement, sign up for very hard work, fork over a giant pile of cash, or in case of emergency: "info _at_ xtclang _dot_ org", but please understand if we cannot respond to every question. Thank you.
+To submit a contributor agreement, sign up for very hard
+work, fork over a giant pile of cash, or in case of
+emergency: "info _at_ xtclang _dot_ org", but please
+understand if we cannot respond to every question.
+Thank you.

build.gradle.kts

@@ -2,6 +2,9 @@
  * Main build file for the XVM project, producing the XDK.
  */
 
+group = "org.xvm"
+version = "0.1.0"
+
 plugins {
     java
 }

javatools/build.gradle.kts

@@ -6,6 +6,31 @@ plugins {
     java
 }
 
+sourceSets {
+    create("implicits") {
+        resources {
+            srcDir {
+                "${project(":ecstasy").buildDir}/resources/"
+            }
+        }
+    }
+//    sourceSets.create("integrationTest") {
+//        java.srcDir("src/integrationTest/java")
+//        java.srcDir("build/generated/source/apt/integrationTest")
+//        resources.srcDir("src/integrationTest/resources")
+//    }
+//    sourceSets.getByName("main") {
+//        java.srcDir("src/main/java")
+//        java.srcDir("src/main/kotlin")
+//    }
+}
+
+//def implicit = copySpec {
+//    from("${project(":ecstasy").buildDir}/resources/") {
+//        include "**/*.x"
+//    }
+//}
+
 tasks.withType(Jar::class) {
     manifest {
         attributes["Manifest-Version"] = "1.0"
@@ -19,6 +44,7 @@ tasks.withType(Jar::class) {
         attributes["Implementation-Version"] = "0.1.0"
         attributes["Implementation-Vendor"] = "xtclang.org"
     }
+    with(implicit)
 }
 
 java {
@@ -27,6 +53,8 @@ java {
 }
 
 dependencies {
+    implementation("org.xtclang.xvm:utils:")
+
     // Use JUnit test framework
     testImplementation("junit:junit:4.12")
 }

javatools/src/main/java/org/xvm/compiler/Parser.java

@@ -4584,7 +4584,7 @@ NamedTypeExpression parseNamedTypeExpression()
             if (tokNarrow != null && expr != null)
                 {
                 log(Severity.ERROR, NONNARROW_CHILD, tokNarrow.getStartPosition(),
-                        tokNarrow.getEndPosition(), null);
+                        tokNarrow.getEndPosition());
                 }
 
             // TypeParameterTypeList

javatools_launcher/build.gradle.kts

@@ -0,0 +1,6 @@
+/*
+ * Build file for the javatools_launcher project.
+ *
+ * The launcher programs need to be built on different hardware/OS combinations, so this project is
+ * not currently automated.
+ */

settings.gradle.kts

@@ -1,4 +1,5 @@
 rootProject.name = "xvm"
+
 include(":utils")               // produces utils.jar for org.xvm.utils package
 include(":unicode")             // produces data files -> :ecstasy/resources, only on request
 include(":ecstasy")             // produces *only* a source zip file (no .xtc), and only on request