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

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

Revision: 12427
          http://sourceforge.net/p/foray/code/12427
Author:   victormote
Date:     2022-01-18 18:56:49 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
1. Fixes for Gradle deprecations. 2. Fixes related to directory movement related to Gradle upgrade.

Modified Paths:
--------------
    trunk/foray/build.gradle
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
    trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
    trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java
    trunk/foray/foray-font/build.gradle
    trunk/foray/foray-orthography/build.gradle

Modified: trunk/foray/build.gradle
===================================================================
--- trunk/foray/build.gradle	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/build.gradle	2022-01-18 18:56:49 UTC (rev 12427)
@@ -256,7 +256,7 @@
 
 task zipAllJavadoc(type: Zip, dependsOn: allJavadoc) {
     from ("${buildDir}/docs/javadoc")
-    appendix = "all"
+    archiveAppendix = "all"
     classifier = "javadoc"
     destinationDirectory = file("${buildDir}")
 }

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-01-18 18:56:49 UTC (rev 12427)
@@ -15,7 +15,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.foray.app.FOray"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="foray-app"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-configuration-file ${foray-config}&#13;&#10;-fo ${fo-example-path}/basic/graphics.fo&#13;&#10;-pdf ${foray-test-output-file}/graphics-basic.pdf"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${build_files}-configuration-file ${foray-config}&#13;&#10;-fo ${fo-example-path}/basic/graphics.fo&#13;&#10;-pdf ${foray-test-output-file}/graphics-basic.pdf"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="foray-app"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java	2022-01-18 18:56:49 UTC (rev 12427)
@@ -129,7 +129,7 @@
      */
     public static File getExamplesDirectory() throws IOException {
         final File sandbox = Environment.getSandbox();
-        return new File(sandbox, "master/dist/resource/fo-examples/");
+        return new File(sandbox, "foray-00-master/dist/resource/fo-examples/");
     }
 
 }

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java	2022-01-18 18:56:49 UTC (rev 12427)
@@ -108,7 +108,7 @@
              * website directory in the "master" project, the IDE does not know about them.
              * See build.gradle where the file is copied into the jar file.
              * Therefore, we look for the file on the local file system. */
-            final File file = new File("../master/doc/web/dtds/0.1/en/" + dtdName);
+            final File file = new File("../foray-00-master/doc/web/dtds/0.1/en/" + dtdName);
             if (file.exists()) {
                 inputStream = new FileInputStream(file);
             }

Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-font/build.gradle	2022-01-18 18:56:49 UTC (rev 12427)
@@ -37,7 +37,7 @@
     outputs.upToDateWhen { false }
     description = "Parse and serialize the Base-14 metrics files"
     classpath = sourceSets.main.runtimeClasspath
-    main = 'org.foray.font.format.type1.Type1MetricsSerializer'
+    mainClass = 'org.foray.font.format.type1.Type1MetricsSerializer'
     args('--input')
     args('src/main/data/base-14')
     args('--output')

Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle	2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-orthography/build.gradle	2022-01-18 18:56:49 UTC (rev 12427)
@@ -38,7 +38,7 @@
     outputs.upToDateWhen { false }
     description = "Parse and serialize the hyphenation patterns"
     classpath = sourceSets.main.runtimeClasspath
-    main = 'org.foray.orthography.util.PatternSerializer'
+    mainClass = 'org.foray.orthography.util.PatternSerializer'
     args('--input')
     args('src/main/data/hyph-patterns')
     args('--output')

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