Browse Source

Revert "Much cleaner build for JSword"

This reverts commit 68a3824a59.
Bradlee Speice 4 years ago
parent
commit
6bef7e78f6
40 changed files with 243 additions and 604 deletions
  1. 6
    0
      .classpath
  2. 7
    1
      .gitignore
  3. 0
    1
      .idea/.name
  4. 0
    22
      .idea/compiler.xml
  5. 0
    3
      .idea/copyright/profiles_settings.xml
  6. 0
    17
      .idea/gradle.xml
  7. 0
    11
      .idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml
  8. 0
    11
      .idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml
  9. 0
    11
      .idea/libraries/Gradle__commons_net_commons_net_3_3.xml
  10. 0
    11
      .idea/libraries/Gradle__junit_junit_4_11.xml
  11. 0
    11
      .idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml
  12. 0
    11
      .idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml
  13. 0
    11
      .idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml
  14. 0
    11
      .idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml
  15. 0
    11
      .idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml
  16. 0
    11
      .idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml
  17. 0
    11
      .idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml
  18. 0
    11
      .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
  19. 0
    11
      .idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml
  20. 0
    11
      .idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml
  21. 0
    11
      .idea/libraries/Gradle__org_tukaani_xz_1_4.xml
  22. 0
    38
      .idea/misc.xml
  23. 0
    8
      .idea/modules.xml
  24. 0
    7
      .idea/vcs.xml
  25. 17
    0
      .project
  26. 13
    46
      build.gradle
  27. 165
    0
      build.xml
  28. BIN
      gradle/wrapper/gradle-wrapper.jar
  29. 0
    6
      gradle/wrapper/gradle-wrapper.properties
  30. 0
    164
      gradlew
  31. 0
    90
      gradlew.bat
  32. 30
    0
      ivy.xml
  33. 0
    1
      jsword
  34. 0
    33
      jsword-minimalbible.iml
  35. 1
    0
      jsword-stub.gradle
  36. 3
    0
      lib/.gitignore
  37. 1
    0
      libs/.gitignore
  38. 0
    2
      settings.gradle
  39. 0
    0
      src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java
  40. 0
    0
      src/main/java/jsword/org/crosswire/jsword/versification/Versification.java

+ 6
- 0
.classpath View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<classpath>
3
+	<classpathentry kind="src" path="src"/>
4
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5
+	<classpathentry kind="output" path="bin"/>
6
+</classpath>

+ 7
- 1
.gitignore View File

@@ -1 +1,7 @@
1
-# Created by .ignore support plugin (hsz.mobi)
1
+/bin
2
+/build
3
+/distribution
4
+/ivy
5
+/tools
6
+/.gradle
7
+*.iml

+ 0
- 1
.idea/.name View File

@@ -1 +0,0 @@
1
-jsword-minimalbible

+ 0
- 22
.idea/compiler.xml View File

@@ -1,22 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="CompilerConfiguration">
4
-    <option name="DEFAULT_COMPILER" value="Javac" />
5
-    <resourceExtensions />
6
-    <wildcardResourcePatterns>
7
-      <entry name="!?*.java" />
8
-      <entry name="!?*.form" />
9
-      <entry name="!?*.class" />
10
-      <entry name="!?*.groovy" />
11
-      <entry name="!?*.scala" />
12
-      <entry name="!?*.flex" />
13
-      <entry name="!?*.kt" />
14
-      <entry name="!?*.clj" />
15
-    </wildcardResourcePatterns>
16
-    <annotationProcessing>
17
-      <profile default="true" name="Default" enabled="false">
18
-        <processorPath useClasspath="true" />
19
-      </profile>
20
-    </annotationProcessing>
21
-  </component>
22
-</project>

+ 0
- 3
.idea/copyright/profiles_settings.xml View File

@@ -1,3 +0,0 @@
1
-<component name="CopyrightManager">
2
-  <settings default="" />
3
-</component>

+ 0
- 17
.idea/gradle.xml View File

@@ -1,17 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="GradleSettings">
4
-    <option name="linkedExternalProjectsSettings">
5
-      <GradleProjectSettings>
6
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
7
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
8
-        <option name="gradleJvm" value="1.7" />
9
-        <option name="modules">
10
-          <set>
11
-            <option value="$PROJECT_DIR$" />
12
-          </set>
13
-        </option>
14
-      </GradleProjectSettings>
15
-    </option>
16
-  </component>
17
-</project>

+ 0
- 11
.idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: commons-codec:commons-codec:1.6">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: commons-logging:commons-logging:1.1.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__commons_net_commons_net_3_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: commons-net:commons-net:3.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/cd0d5510908225f76c5fe5a3f1df4fa44866f81e/commons-net-3.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/ccfa0721eae567b3c47cfaf3cca20e2491362bf6/commons-net-3.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__junit_junit_4_11.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: junit:junit:4.11">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/4e031bb61df09069aeb2bffb4019e7a5034a4ee0/junit-4.11.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/28e0ad201304e4a4abf999ca0570b7cffc352c3c/junit-4.11-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.commons:commons-compress:1.7">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/ab365c96ee9bc88adcc6fa40d185c8e15a31410d/commons-compress-1.7.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/8b080f4c0bfc9977093412376e2d300512a5981/commons-compress-1.7-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.httpcomponents:httpclient:4.3.2">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/10a45d03873baa34436ae54548d9f1140d4bb68a/httpclient-4.3.2.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/b2ee1f7676394469864f3350c34dceb2214cd372/httpclient-4.3.2-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.httpcomponents:httpcore:4.3.2">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.lucene:lucene-analyzers:3.0.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/9fd07cce890dd18bdd2616b5fb5e6f10d55b819e/lucene-analyzers-3.0.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/b18bfcfabcb35e3e95dccd3498c2d6a5aa49f469/lucene-analyzers-3.0.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.lucene:lucene-core:3.0.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/335f7ea0e28a4a1358aa745f4bd2037e8afe44fc/lucene-core-3.0.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/d3b608052205d068ddccbffd9fd5e24fdd438060/lucene-core-3.0.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.lucene:lucene-smartcn:3.0.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/97ebddd027f8f7bc51eab43d0c204be699c8694/lucene-smartcn-3.0.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/adb22a6f574633fff215d0f1273648f731d5df9d/lucene-smartcn-3.0.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.apache.lucene:lucene-snowball:3.0.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/e0c15cc6929e29cc7908246cc8e2c906ff2c1cc6/lucene-snowball-3.0.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/7e8fa7f20dd96f1aacc3c170ead9d0efc4b32c67/lucene-snowball-3.0.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.jdom:jdom2:2.0.5">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.6">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/562424e36df3d2327e8e9301a76027fca17d54ea/slf4j-api-1.7.6.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/97bb93c1badeae97a3d37e3c902df2985ee3de34/slf4j-api-1.7.6-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 11
.idea/libraries/Gradle__org_tukaani_xz_1_4.xml View File

@@ -1,11 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Gradle: org.tukaani:xz:1.4">
3
-    <CLASSES>
4
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3/xz-1.4.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC />
7
-    <SOURCES>
8
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/4627f50e8fedcd2002f7ace1cfa1a1eea0ab631a/xz-1.4-sources.jar!/" />
9
-    </SOURCES>
10
-  </library>
11
-</component>

+ 0
- 38
.idea/misc.xml View File

@@ -1,38 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="EntryPointsManager">
4
-    <entry_points version="2.0" />
5
-  </component>
6
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
7
-    <OptionsSetting value="true" id="Add" />
8
-    <OptionsSetting value="true" id="Remove" />
9
-    <OptionsSetting value="true" id="Checkout" />
10
-    <OptionsSetting value="true" id="Update" />
11
-    <OptionsSetting value="true" id="Status" />
12
-    <OptionsSetting value="true" id="Edit" />
13
-    <ConfirmationsSetting value="0" id="Add" />
14
-    <ConfirmationsSetting value="0" id="Remove" />
15
-  </component>
16
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
17
-    <output url="file://$PROJECT_DIR$/out" />
18
-  </component>
19
-  <component name="UnicodeBrowser">
20
-    <option name="fontName" value="Source Code Pro" />
21
-  </component>
22
-  <component name="masterDetails">
23
-    <states>
24
-      <state key="ProjectJDKs.UI">
25
-        <settings>
26
-          <last-edited>1.7</last-edited>
27
-          <splitter-proportions>
28
-            <option name="proportions">
29
-              <list>
30
-                <option value="0.2" />
31
-              </list>
32
-            </option>
33
-          </splitter-proportions>
34
-        </settings>
35
-      </state>
36
-    </states>
37
-  </component>
38
-</project>

+ 0
- 8
.idea/modules.xml View File

@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="ProjectModuleManager">
4
-    <modules>
5
-      <module fileurl="file://$PROJECT_DIR$/jsword-minimalbible.iml" filepath="$PROJECT_DIR$/jsword-minimalbible.iml" />
6
-    </modules>
7
-  </component>
8
-</project>

+ 0
- 7
.idea/vcs.xml View File

@@ -1,7 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="VcsDirectoryMappings">
4
-    <mapping directory="" vcs="Git" />
5
-    <mapping directory="$PROJECT_DIR$/jsword" vcs="Git" />
6
-  </component>
7
-</project>

+ 17
- 0
.project View File

@@ -0,0 +1,17 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>jsword-minimalbible</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>org.eclipse.jdt.core.javabuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>org.eclipse.jdt.core.javanature</nature>
16
+	</natures>
17
+</projectDescription>

+ 13
- 46
build.gradle View File

@@ -1,52 +1,19 @@
1
-group 'org.bspeice'
2
-version '1.0-SNAPSHOT'
3
-
4
-apply plugin: 'java'
5
-
6
-repositories {
7
-    mavenCentral()
1
+configurations {
2
+	buildJSword
8 3
 }
9 4
 
10
-sourceSets {
11
-    main {
12
-        java {
13
-            srcDir 'src/main/java'
14
-        }
15
-        resources {
16
-            srcDir 'src/main/resources'
17
-        }
5
+task compileJava (type: GradleBuild) { 
6
+	buildFile = 'jsword-stub.gradle'
7
+	tasks = ['clean', 'ivy.check', 'ivy.download', 'ivy.task', 'ivy',
8
+			'init', 'mergeCode', 'compile', 'jar'] //, 'copyJarsToMinimalBible']
9
+    ext.outputJar = file('distribution/jsword.jar')
10
+    outputs.upToDateWhen {
11
+        ext.outputJar.exists()
18 12
     }
19 13
 }
20 14
 
21
-println(sourceSets.main.java)
22
-
23
-task mergeSources(type: Copy) {
24
-    from 'jsword/src/main/java'
25
-    from 'src/stage/java'
26
-
27
-    into 'src/main/java'
28
-}
29
-
30
-task mergeResources(type: Copy) {
31
-    from 'jsword/src/main/resources'
32
-    from 'src/stage/resources'
33
-
34
-    into 'src/main/resources'
35
-}
36
-
37
-tasks.compileJava.dependsOn(mergeSources)
38
-
39
-dependencies {
40
-    compile 'commons-net:commons-net:3.3'
41
-    compile 'org.apache.commons:commons-compress:1.7'
42
-    compile 'org.apache.httpcomponents:httpcore:4.3.2'
43
-    compile 'org.apache.httpcomponents:httpclient:4.3.2'
44
-    compile 'org.slf4j:slf4j-api:1.7.6'
45
-    compile 'org.jdom:jdom2:2.0.5'
46
-    compile 'org.apache.lucene:lucene-core:3.0.3'
47
-    compile 'org.apache.lucene:lucene-analyzers:3.0.3'
48
-    compile 'org.apache.lucene:lucene-snowball:3.0.3'
49
-    compile 'org.apache.lucene:lucene-smartcn:3.0.3'
50
-
51
-    testCompile group: 'junit', name: 'junit', version: '4.11'
15
+artifacts {
16
+	buildJSword(compileJava.ext.outputJar) {
17
+		builtBy compileJava
18
+	}
52 19
 }

+ 165
- 0
build.xml View File

@@ -0,0 +1,165 @@
1
+<project name="buildJswordTweakedJar" default="copyJarsToMinimalBible"
2
+	basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3
+
4
+	<!-- Much of this code taken lovingly from https://github.com/mjdenham/and-bible/blob/master/jsword-tweaks/build.xml -->
5
+
6
+	<property name="jsword.project" location="../jsword" />
7
+	<property name="jsword.src" location="${jsword.project}/src/main/java" />
8
+	<property name="jsword.resources" location="${jsword.project}/src/main/resources" />
9
+	<property name="minbible.jsword.src" location="src/main/java/jsword" />
10
+	<property name="build.src" location="build/src" />
11
+	<property name="build.class" location="build/class" />
12
+	<property name="distribution" location="distribution" />
13
+	<property name="MinimalBible" location="../MinimalBible" />
14
+
15
+	<dirname property="core.basedir" file="${ant.file.core}" />
16
+	<property name="jsword-tweaks.home" location="${core.basedir}" />
17
+	<property name="jsword-dependencydir" location="${jsword-tweaks.home}/lib/jars" />
18
+
19
+	<path id="classpath">
20
+		<!-- First set of jars is given us by ivy -->
21
+		<fileset dir="${jsword-dependencydir}" includes="*.jar" />
22
+		<fileset dir="./libs" includes="*.jar" />
23
+	</path>
24
+
25
+	<target name="clean">
26
+		<delete dir="${build.src}" />
27
+		<delete dir="${build.class}" />
28
+		<delete dir="${distribution}" />
29
+		<delete dir="${jsword-dependencydir}" />
30
+	</target>
31
+
32
+	<target name="init" depends="clean">
33
+		<tstamp />
34
+		<mkdir dir="${build.src}" />
35
+		<mkdir dir="${build.class}" />
36
+		<mkdir dir="${distribution}" />
37
+		<mkdir dir="${jsword-dependencydir}" />
38
+	</target>
39
+
40
+	<target name="mergeCode" depends="init">
41
+		<copy todir="${build.src}">
42
+			<fileset dir="${jsword.src}" />
43
+			<fileset dir="${jsword.resources}">
44
+				<exclude name="org/crosswire/jsword/versification/**" />
45
+			</fileset>
46
+		</copy>
47
+		<copy todir="${build.src}" filtering="yes">
48
+			<fileset dir="${jsword.resources}">
49
+				<include name="org/crosswire/jsword/versification/**" />
50
+			</fileset>
51
+			<!-- zerosUnmapped causes exceptions and does not map verse 0 so comment 
52
+				it out -->
53
+			<filterchain>
54
+				<tokenfilter>
55
+					<replaceregex pattern="!zerosUnmapped"
56
+						replace="#!zerosUnmapped // commented out" />
57
+				</tokenfilter>
58
+			</filterchain>
59
+		</copy>
60
+
61
+		<!-- switch the Chinese localisation defaults around so default CN is simplified 
62
+			and TW is Traditional -->
63
+		<copy file="${jsword.resources}/BibleNames_zh.properties" tofile="${build.src}/BibleNames_zh_TW.properties" />
64
+		<copy file="${jsword.resources}/BibleNames_zh_CN.properties"
65
+			tofile="${build.src}/BibleNames_zh.properties" overwrite="true" />
66
+
67
+		<copy todir="${build.src}" overwrite="true">
68
+			<fileset dir="${minbible.jsword.src}" />
69
+		</copy>
70
+
71
+	</target>
72
+
73
+	<target name="compile" depends="mergeCode, ivy">
74
+		<javac srcdir="${build.src}" destdir="${build.class}"
75
+			classpathref="classpath" debug="true" source="1.6" target="1.6" />
76
+	</target>
77
+
78
+	<target name="jar" depends="compile">
79
+		<!-- And use JarJar to shade the HttpClient -->
80
+		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
81
+			classpath="${jsword-dependencydir}/jarjar-1.3.jar" />
82
+		<jarjar jarfile="${distribution}/jsword.jar">
83
+			<fileset dir="${build.class}" />
84
+			<!-- need to include the .properties and .plugin files -->
85
+			<fileset dir="${build.src}">
86
+				<exclude name="**/*.java" />
87
+				<exclude name="**/*.html" />
88
+			</fileset>
89
+			<zipgroupfileset dir="${jsword-dependencydir}" includes="*.jar" excludes="junit-*.jar, hamcrest-*.jar, jarjar-*.jar, icu4j-*.jar" />
90
+			<rule pattern="org.apache.http.**" result="org.apache.shaded.http.@1" />
91
+		</jarjar>
92
+		
93
+		<!-- We can use regular jar to build the src -->
94
+		<jar jarfile="${distribution}/jsword-src.jar" basedir="${build.src}" />
95
+	</target>
96
+
97
+	<target name="copyJarsToMinimalBible" depends="jar"
98
+		description="Copy generated jars to And Bible for use">
99
+		<copy todir="${MinimalBible}/libs">
100
+			<fileset dir="${distribution}" includes="*.jar" excludes="*-src.jar" />
101
+			<!-- We only need to include jsword.jar, the jarjar already included dependencies. -->
102
+		</copy>
103
+		<copy todir="${MinimalBible}/libs-src">
104
+			<fileset dir="${distribution}" includes="*-src.jar" />
105
+		</copy>
106
+	</target>
107
+
108
+	<!--======================================================================= 
109
+		== Use ivy to manage external jars. == These are properties related to ivy. 
110
+		========================================================================= -->
111
+	<property name="ivy.version" value="2.3.0" />
112
+	<property name="tools.home" location="${jsword-tweaks.home}/tools" />
113
+	<property name="ivy.home" location="${tools.home}/ivy" />
114
+	<property name="ivy.url"
115
+		value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
116
+	<property name="ivy.jar.file" location="${ivy.home}/ivy-${ivy.version}.jar" />
117
+	<property name="ivy.quiet" value="default" /> <!-- default or quiet -->
118
+	<property name="ivy.sync" value="false" /> <!-- true or false -->
119
+	<property name="ivy.project.dir" location="${jsword-tweaks.home}" />
120
+	<property name="ivy.lib.dir" location="${ivy.project.dir}/lib" />
121
+	<property name="ivy.dep.file" location="${ivy.project.dir}/ivy.xml" />
122
+	<property name="ivy.default.ivy.user.dir" location="${ivy.project.dir}/ivy" />
123
+
124
+	<!-- Ivy.sync controls whether only the current version of jar is allowed. 
125
+		== This is good when updating the project, but not from day-to-day == since 
126
+		we build extra stuff into the same location. Having sync="true" == causes 
127
+		that to be deleted and need to be restored. -->
128
+	<target name="ivy" description="Retrieve dependencies with ivy"
129
+		depends="ivy.task">
130
+		<ivy:retrieve sync="${ivy.sync}"
131
+			pattern="${ivy.lib.dir}/[type]s/[artifact]-[revision].[ext]" log="${ivy.quiet}" />
132
+		<ivy:cachepath pathid="default.path" />
133
+	</target>
134
+
135
+	<target name="ivy.clean" description="Remove the ivy installation">
136
+		<delete dir="${ivy.home}" />
137
+	</target>
138
+
139
+	<target name="ivy.clean-cache" description="Remove dependent jars that ivy manages"
140
+		depends="ivy.task">
141
+		<ivy:cleancache />
142
+	</target>
143
+
144
+	<!-- Make ivy visible to Ant -->
145
+	<target name="ivy.task" depends="ivy.download">
146
+		<path id="ivy.lib.path">
147
+			<fileset dir="${ivy.home}" includes="*.jar" />
148
+		</path>
149
+		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
150
+			classpathref="ivy.lib.path" />
151
+	</target>
152
+
153
+	<!-- Download ivy -->
154
+	<target name="ivy.download" depends="ivy.check" unless="ivy.present">
155
+		<mkdir dir="${ivy.home}" />
156
+		<!-- download Ivy from web site so that it can be used even without any 
157
+			special installation -->
158
+		<get src="${ivy.url}" dest="${ivy.jar.file}" usetimestamp="true" />
159
+	</target>
160
+
161
+	<!-- See if Ivy is installed -->
162
+	<target name="ivy.check">
163
+		<available file="${ivy.jar.file}" type="file" property="ivy.present" />
164
+	</target>
165
+</project>

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 0
- 6
gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +0,0 @@
1
-#Sat Jun 13 18:08:03 EDT 2015
2
-distributionBase=GRADLE_USER_HOME
3
-distributionPath=wrapper/dists
4
-zipStoreBase=GRADLE_USER_HOME
5
-zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

+ 0
- 164
gradlew View File

@@ -1,164 +0,0 @@
1
-#!/usr/bin/env bash
2
-
3
-##############################################################################
4
-##
5
-##  Gradle start up script for UN*X
6
-##
7
-##############################################################################
8
-
9
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10
-DEFAULT_JVM_OPTS=""
11
-
12
-APP_NAME="Gradle"
13
-APP_BASE_NAME=`basename "$0"`
14
-
15
-# Use the maximum available, or set MAX_FD != -1 to use that value.
16
-MAX_FD="maximum"
17
-
18
-warn ( ) {
19
-    echo "$*"
20
-}
21
-
22
-die ( ) {
23
-    echo
24
-    echo "$*"
25
-    echo
26
-    exit 1
27
-}
28
-
29
-# OS specific support (must be 'true' or 'false').
30
-cygwin=false
31
-msys=false
32
-darwin=false
33
-case "`uname`" in
34
-  CYGWIN* )
35
-    cygwin=true
36
-    ;;
37
-  Darwin* )
38
-    darwin=true
39
-    ;;
40
-  MINGW* )
41
-    msys=true
42
-    ;;
43
-esac
44
-
45
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
46
-if $cygwin ; then
47
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48
-fi
49
-
50
-# Attempt to set APP_HOME
51
-# Resolve links: $0 may be a link
52
-PRG="$0"
53
-# Need this for relative symlinks.
54
-while [ -h "$PRG" ] ; do
55
-    ls=`ls -ld "$PRG"`
56
-    link=`expr "$ls" : '.*-> \(.*\)$'`
57
-    if expr "$link" : '/.*' > /dev/null; then
58
-        PRG="$link"
59
-    else
60
-        PRG=`dirname "$PRG"`"/$link"
61
-    fi
62
-done
63
-SAVED="`pwd`"
64
-cd "`dirname \"$PRG\"`/" >&-
65
-APP_HOME="`pwd -P`"
66
-cd "$SAVED" >&-
67
-
68
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69
-
70
-# Determine the Java command to use to start the JVM.
71
-if [ -n "$JAVA_HOME" ] ; then
72
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73
-        # IBM's JDK on AIX uses strange locations for the executables
74
-        JAVACMD="$JAVA_HOME/jre/sh/java"
75
-    else
76
-        JAVACMD="$JAVA_HOME/bin/java"
77
-    fi
78
-    if [ ! -x "$JAVACMD" ] ; then
79
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80
-
81
-Please set the JAVA_HOME variable in your environment to match the
82
-location of your Java installation."
83
-    fi
84
-else
85
-    JAVACMD="java"
86
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
87
-
88
-Please set the JAVA_HOME variable in your environment to match the
89
-location of your Java installation."
90
-fi
91
-
92
-# Increase the maximum file descriptors if we can.
93
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
94
-    MAX_FD_LIMIT=`ulimit -H -n`
95
-    if [ $? -eq 0 ] ; then
96
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
97
-            MAX_FD="$MAX_FD_LIMIT"
98
-        fi
99
-        ulimit -n $MAX_FD
100
-        if [ $? -ne 0 ] ; then
101
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
102
-        fi
103
-    else
104
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105
-    fi
106
-fi
107
-
108
-# For Darwin, add options to specify how the application appears in the dock
109
-if $darwin; then
110
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111
-fi
112
-
113
-# For Cygwin, switch paths to Windows format before running java
114
-if $cygwin ; then
115
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
117
-
118
-    # We build the pattern for arguments to be converted via cygpath
119
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120
-    SEP=""
121
-    for dir in $ROOTDIRSRAW ; do
122
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
123
-        SEP="|"
124
-    done
125
-    OURCYGPATTERN="(^($ROOTDIRS))"
126
-    # Add a user-defined pattern to the cygpath arguments
127
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129
-    fi
130
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
131
-    i=0
132
-    for arg in "$@" ; do
133
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
135
-
136
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
137
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138
-        else
139
-            eval `echo args$i`="\"$arg\""
140
-        fi
141
-        i=$((i+1))
142
-    done
143
-    case $i in
144
-        (0) set -- ;;
145
-        (1) set -- "$args0" ;;
146
-        (2) set -- "$args0" "$args1" ;;
147
-        (3) set -- "$args0" "$args1" "$args2" ;;
148
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154
-    esac
155
-fi
156
-
157
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158
-function splitJvmOpts() {
159
-    JVM_OPTS=("$@")
160
-}
161
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163
-
164
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

+ 0
- 90
gradlew.bat View File

@@ -1,90 +0,0 @@
1
-@if "%DEBUG%" == "" @echo off
2
-@rem ##########################################################################
3
-@rem
4
-@rem  Gradle startup script for Windows
5
-@rem
6
-@rem ##########################################################################
7
-
8
-@rem Set local scope for the variables with windows NT shell
9
-if "%OS%"=="Windows_NT" setlocal
10
-
11
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12
-set DEFAULT_JVM_OPTS=
13
-
14
-set DIRNAME=%~dp0
15
-if "%DIRNAME%" == "" set DIRNAME=.
16
-set APP_BASE_NAME=%~n0
17
-set APP_HOME=%DIRNAME%
18
-
19
-@rem Find java.exe
20
-if defined JAVA_HOME goto findJavaFromJavaHome
21
-
22
-set JAVA_EXE=java.exe
23
-%JAVA_EXE% -version >NUL 2>&1
24
-if "%ERRORLEVEL%" == "0" goto init
25
-
26
-echo.
27
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28
-echo.
29
-echo Please set the JAVA_HOME variable in your environment to match the
30
-echo location of your Java installation.
31
-
32
-goto fail
33
-
34
-:findJavaFromJavaHome
35
-set JAVA_HOME=%JAVA_HOME:"=%
36
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37
-
38
-if exist "%JAVA_EXE%" goto init
39
-
40
-echo.
41
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42
-echo.
43
-echo Please set the JAVA_HOME variable in your environment to match the
44
-echo location of your Java installation.
45
-
46
-goto fail
47
-
48
-:init
49
-@rem Get command-line arguments, handling Windowz variants
50
-
51
-if not "%OS%" == "Windows_NT" goto win9xME_args
52
-if "%@eval[2+2]" == "4" goto 4NT_args
53
-
54
-:win9xME_args
55
-@rem Slurp the command line arguments.
56
-set CMD_LINE_ARGS=
57
-set _SKIP=2
58
-
59
-:win9xME_args_slurp
60
-if "x%~1" == "x" goto execute
61
-
62
-set CMD_LINE_ARGS=%*
63
-goto execute
64
-
65
-:4NT_args
66
-@rem Get arguments from the 4NT Shell from JP Software
67
-set CMD_LINE_ARGS=%$
68
-
69
-:execute
70
-@rem Setup the command line
71
-
72
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73
-
74
-@rem Execute Gradle
75
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76
-
77
-:end
78
-@rem End local scope for the variables with windows NT shell
79
-if "%ERRORLEVEL%"=="0" goto mainEnd
80
-
81
-:fail
82
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83
-rem the _cmd.exe /c_ return code!
84
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85
-exit /b 1
86
-
87
-:mainEnd
88
-if "%OS%"=="Windows_NT" endlocal
89
-
90
-:omega

+ 30
- 0
ivy.xml View File

@@ -0,0 +1,30 @@
1
+<ivy-module version="2.0">
2
+  <info organisation="org.crosswire" module="jsword"/>
3
+  <dependencies>
4
+    <dependency org="commons-codec"             name="commons-codec"    rev="1.9"       conf="default->master,sources" />
5
+    <dependency org="commons-net"               name="commons-net"      rev="3.3"       conf="default->master,sources" />
6
+    <dependency org="org.apache.commons"        name="commons-compress" rev="1.7"       conf="default->master,sources" />
7
+    <dependency org="org.tukaani"               name="xz"               rev="1.4"       conf="default->master,sources" />
8
+    <dependency org="org.apache.httpcomponents" name="httpcore"         rev="4.3.2"     conf="default->master,sources" />
9
+    <dependency org="org.apache.httpcomponents" name="httpclient"       rev="4.3.2"     conf="default->master,sources" />
10
+    <dependency org="org.jdom"                  name="jdom2"            rev="2.0.5"     conf="default->master,sources" />
11
+    <dependency org="org.apache.lucene"         name="lucene-core"      rev="3.0.3"     conf="default->master,sources" />
12
+    <dependency org="org.apache.lucene"         name="lucene-analyzers" rev="3.0.3"     conf="default->master,sources" />
13
+    <dependency org="org.apache.lucene"         name="lucene-smartcn"   rev="3.0.3"     conf="default->master,sources" />
14
+    <dependency org="org.apache.lucene"         name="lucene-snowball"  rev="3.0.3"     conf="default->master,sources" />
15
+    <dependency org="junit"                     name="junit"            rev="4.11"      conf="default->master,sources" />
16
+    <dependency org="org.hamcrest"              name="hamcrest-library" rev="1.3"/>
17
+    <dependency org="com.ibm.icu"               name="icu4j"            rev="52.1"      conf="default->master,sources" />
18
+	<dependency org="org.slf4j"                 name="slf4j-api"        rev="1.7.6"     conf="default->master,sources" />
19
+	<dependency org="org.slf4j"                 name="jcl-over-slf4j"   rev="1.7.6"     conf="default->master,sources" />
20
+	<dependency org="org.slf4j"                 name="slf4j-jdk14"      rev="1.7.6"     conf="default->master,sources" />
21
+    <!-- dependency org="xalan"                     name="xalan"            rev="2.7.1"     conf="default->master,sources" / -->
22
+    <!-- dependency org="xalan"                     name="serializer"       rev="2.7.1"     conf="default->master,sources" / -->
23
+    <!-- dependency org="xerces"                    name="xercesImpl"       rev="2.11.0"    conf="default->master,sources" / -->
24
+    
25
+    <!-- And to fix the HttpClient shenanigans...
26
+    	http://stackoverflow.com/questions/20238421/java-lang-nosuchfielderror-org-apache-http-message-basiclineformatter-instance -->
27
+    <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" />
28
+    
29
+  </dependencies>
30
+</ivy-module>

+ 0
- 1
jsword

@@ -1 +0,0 @@
1
-Subproject commit d7ad5ef9b9ace682f80fff65c8e9124748b1b210

+ 0
- 33
jsword-minimalbible.iml View File

@@ -1,33 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<module external.linked.project.id="jsword-minimalbible" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.bspeice" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
3
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
4
-    <output url="file://$MODULE_DIR$/build/classes/main" />
5
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
6
-    <exclude-output />
7
-    <content url="file://$MODULE_DIR$">
8
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
9
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
11
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
12
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
13
-      <excludeFolder url="file://$MODULE_DIR$/build" />
14
-    </content>
15
-    <orderEntry type="inheritedJdk" />
16
-    <orderEntry type="sourceFolder" forTests="false" />
17
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
18
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
19
-    <orderEntry type="library" exported="" name="Gradle: commons-net:commons-net:3.3" level="project" />
20
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.6" level="project" />
21
-    <orderEntry type="library" exported="" name="Gradle: org.apache.commons:commons-compress:1.7" level="project" />
22
-    <orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
23
-    <orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpclient:4.3.2" level="project" />
24
-    <orderEntry type="library" exported="" name="Gradle: org.jdom:jdom2:2.0.5" level="project" />
25
-    <orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-core:3.0.3" level="project" />
26
-    <orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-analyzers:3.0.3" level="project" />
27
-    <orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-snowball:3.0.3" level="project" />
28
-    <orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-smartcn:3.0.3" level="project" />
29
-    <orderEntry type="library" exported="" name="Gradle: org.tukaani:xz:1.4" level="project" />
30
-    <orderEntry type="library" exported="" name="Gradle: commons-logging:commons-logging:1.1.3" level="project" />
31
-    <orderEntry type="library" exported="" name="Gradle: commons-codec:commons-codec:1.6" level="project" />
32
-  </component>
33
-</module>

+ 1
- 0
jsword-stub.gradle View File

@@ -0,0 +1 @@
1
+ant.importBuild('../jsword-minimalbible/build.xml')

+ 3
- 0
lib/.gitignore View File

@@ -0,0 +1,3 @@
1
+/javadocs
2
+/sources
3
+/jars

+ 1
- 0
libs/.gitignore View File

@@ -0,0 +1 @@
1
+*

+ 0
- 2
settings.gradle View File

@@ -1,2 +0,0 @@
1
-rootProject.name = 'jsword-minimalbible'
2
-

src/stage/java/org/crosswire/jsword/book/FilterUtil.java → src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java View File


src/stage/java/org/crosswire/jsword/versification/Versification.java → src/main/java/jsword/org/crosswire/jsword/versification/Versification.java View File


Loading…
Cancel
Save