[FOray-commit] SF.net SVN: foray:[12398] trunk/foray

[<vic...@us...>]

Revision: 12398
          http://sourceforge.net/p/foray/code/12398
Author:   victormote
Date:     2022-01-14 19:57:53 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
Convert some projects to explicit (instead of transitive) dependencies.

Modified Paths:
--------------
    trunk/foray/foray-common/build.gradle
    trunk/foray/foray-font/build.gradle
    trunk/foray/foray-mif/build.gradle
    trunk/foray/foray-orthography/build.gradle
    trunk/foray/foray-output/build.gradle
    trunk/foray/foray-ps/build.gradle
    trunk/foray/master/build.gradle

Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-common/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -1,21 +1,25 @@
 description = 'foray-common'
 
 dependencies {
-    api group: 'org.slf4j',       name: 'slf4j-api',       version: slf4jVersion
-    api group: 'commons-io',      name: 'commons-io',      version: commonsIoVersion
-    api group: 'xml-resolver',    name: 'xml-resolver',    version: xmlResolverVersion
-    api group: 'com.ibm.icu',     name: 'icu4j',           version: icu4jVersion
+    api group: 'org.slf4j',             name: 'slf4j-api',                  version: slf4jVersion
+    api group: 'commons-io',            name: 'commons-io',                 version: commonsIoVersion
+    api group: 'xml-resolver',          name: 'xml-resolver',               version: xmlResolverVersion
+    api group: 'com.ibm.icu',           name: 'icu4j',                      version: icu4jVersion
 
-    api group: 'org.axsl',        name: 'axsl-common',     version: axslVersion
-    api group: 'org.axsl',        name: 'axsl-kp-model',   version: axslVersion
-    api group: 'org.axsl',        name: 'axsl-ps',         version: axslVersion
-    api group: 'org.axsl',        name: 'axsl-font',       version: axslVersion
-    api group: 'org.axsl',        name: 'axsl-unicode',    version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-common',                version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-kp-model',              version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-orthography',           version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-ps',                    version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-font',                  version: axslVersion
+    api group: 'org.axsl',              name: 'axsl-unicode',               version: axslVersion
 
-    implementation group: 'ch.qos.logback',  name: 'logback-classic', version: logbackClassicVersion
+    implementation group:
+        'ch.qos.logback',               name: 'logback-classic',            version: logbackClassicVersion
 
-    testImplementation group: 'junit',       name: 'junit',           version: junitVersion
-    testImplementation group: 'org.mockito', name: 'mockito-core',    version: mockitoVersion
+    testImplementation group:
+        'junit',                        name: 'junit',                      version: junitVersion
+    testImplementation group:
+        'org.mockito',                  name: 'mockito-core',               version: mockitoVersion
 }
 
 javadoc {

Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-font/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -9,6 +9,9 @@
 
     api group: 'org.axsl',          name: 'axsl-common',       version: axslVersion
     api group: 'org.axsl',          name: 'axsl-font',         version: axslVersion
+    api group: 'org.axsl',          name: 'axsl-ps',         version: axslVersion
+    api group: 'org.axsl',          name: 'axsl-orthography',         version: axslVersion
+    api group: 'org.axsl',          name: 'axsl-unicode',         version: axslVersion
 
     api project(':foray-common')
     api project(':foray-ps')

Modified: trunk/foray/foray-mif/build.gradle
===================================================================
--- trunk/foray/foray-mif/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-mif/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -2,7 +2,10 @@
 
 dependencies {
     api group: 'org.slf4j',       name: 'slf4j-api',       version: slf4jVersion
+
     api group: 'org.axsl',        name: 'axsl-mif',        version: axslVersion
+    api group: 'org.axsl',        name: 'axsl-output',     version: axslVersion
+
     api project(':foray-common')
 
     implementation group: 'ch.qos.logback',  name: 'logback-classic', version: logbackClassicVersion

Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-orthography/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -5,9 +5,14 @@
     api group: 'xml-resolver',    name: 'xml-resolver',                     version: xmlResolverVersion
     api group: 'org.apache.ant',  name: 'ant-launcher',                     version: antVersion
     api group: 'commons-cli',     name: 'commons-cli',                      version: commonsCliVersion
+    api group: 'commons-io',      name: 'commons-io',                       version: commonsIoVersion
     api group: 'com.ibm.icu',     name: 'icu4j',                            version: icu4jVersion
+
+    api group: 'org.axsl',        name: 'axsl-common',                      version: axslVersion
     api group: 'org.axsl',        name: 'axsl-orthography',                 version: axslVersion
     api group: 'org.axsl',        name: 'axsl-fotree',                      version: axslVersion
+    api group: 'org.axsl',        name: 'axsl-kp-model',                    version: axslVersion
+    api group: 'org.axsl',        name: 'axsl-unicode',                     version: axslVersion
     api project(':foray-common')
 
     implementation group: 'ch.qos.logback',  name: 'logback-classic',       version: logbackClassicVersion

Modified: trunk/foray/foray-output/build.gradle
===================================================================
--- trunk/foray/foray-output/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-output/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -2,9 +2,12 @@
 
 dependencies {
     api group: 'org.slf4j',       name: 'slf4j-api',       version: slf4jVersion
+
+    api group: 'org.axsl',        name: 'axsl-font',       version: axslVersion
     api group: 'org.axsl',        name: 'axsl-output',     version: axslVersion
     api group: 'org.axsl',        name: 'axsl-mif',        version: axslVersion
     api group: 'org.axsl',        name: 'axsl-fotree',     version: axslVersion
+
     api project(':foray-common')
 
     implementation group: 'ch.qos.logback',  name: 'logback-classic', version: logbackClassicVersion

Modified: trunk/foray/foray-ps/build.gradle
===================================================================
--- trunk/foray/foray-ps/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/foray-ps/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -1,15 +1,18 @@
 description = 'foray-ps'
 
 dependencies {
-    api group: 'org.slf4j',       name: 'slf4j-api',       version: slf4jVersion
-    api group: 'commons-cli',     name: 'commons-cli',     version: commonsCliVersion
-    api group: 'org.axsl',        name: 'axsl-common',     version: axslVersion
-    api group: 'org.axsl',        name: 'axsl-ps',         version: axslVersion
+    api group: 'org.slf4j',                     name: 'slf4j-api',                  version: slf4jVersion
+    api group: 'commons-cli',                   name: 'commons-cli',                version: commonsCliVersion
+    api group: 'commons-io',                    name: 'commons-io',                 version: commonsIoVersion
+
+    api group: 'org.axsl',                      name: 'axsl-common',                version: axslVersion
+    api group: 'org.axsl',                      name: 'axsl-ps',                    version: axslVersion
+
     api project(':foray-common')
 
-    implementation group: 'ch.qos.logback',  name: 'logback-classic', version: logbackClassicVersion
+    implementation group: 'ch.qos.logback',     name: 'logback-classic',            version: logbackClassicVersion
 
-    testImplementation group: 'junit',       name: 'junit',           version: junitVersion
+    testImplementation group: 'junit',          name: 'junit',                      version: junitVersion
 }
 
 javadoc {

Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle	2022-01-14 16:15:11 UTC (rev 12397)
+++ trunk/foray/master/build.gradle	2022-01-14 19:57:53 UTC (rev 12398)
@@ -32,8 +32,13 @@
     /******************** See Note 1 below for information about dependency releases. ********************/
     ext.javaSourceCompatibility = JavaVersion.VERSION_1_7
     ext.javaTargetCompatibility = JavaVersion.VERSION_1_7
-    
+
+    /* Dependencies related to aXSL. These should be maintained at the same versions used by aXSL. */    
     ext.axslVersion = '0.3-SNAPSHOT'              // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
+    ext.svgDomVersion = '1.1'                     // See aXSL master/build.gradle
+    ext.mathMlDomVersion = '2.0'                  // See aXSL master/build.gradle
+    /* End of aXSL-related dependencies. */
+
     ext.slf4jVersion = '1.7.30'                   // Latest is 1.7.30       as of 2021-01-12.
     ext.commonsIoVersion = '2.6'                  // Latest is 2.8.0        as of 2021-01-12. See Note 3.
     ext.commonsDiscoveryVersion = '0.5'           // Latest is 0.5          as of 2021-01-12.
@@ -88,6 +93,12 @@
  *
  */
 
+    /* Force each project to delare its dependencies explicitly. This should make it easier to see dependencies that
+    are design flaws. */
+//    configurations.all {
+//        transitive = false
+//    }
+
 }
 
 subprojects {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.