mirror-github-minimalbible/jsword-minimalbible
1
0
Fork 0
mirror of https://github.com/MinimalBible/jsword-minimalbible synced 2025-11-04 02:20:31 -05:00
Code Issues Releases Wiki Activity

Revert "Fix up some build issues"

Browse Source 
This reverts commit 61dbab2491.
This commit is contained in:
Bradlee Speice
2015-06-28 21:38:01 -04:00
parent 61dbab2491
commit 37f46bcf6d
4 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/misc.xml generated
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@ -10,11 +13,8 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="UnicodeBrowser">
<option name="fontName" value="Source Code Pro" />

38
build.gradle
View File

@ -1,33 +1,40 @@
group 'org.bspeice'
version '1.0-SNAPSHOT'
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.1'
}
}
apply plugin: 'java'
apply plugin: 'com.github.johnrengelman.shadow'
repositories {
mavenCentral()
}
sourceSets {
main {
java {
srcDir 'src/main/java'
}
resources {
srcDir 'src/main/resources'
}
}
}
println(sourceSets.main.java)
task mergeSources(type: Copy) {
from 'jsword/src/main/java', 'src/stage/java'
from 'jsword/src/main/java'
from 'src/stage/java'
into 'src/main/java'
}
task mergeResources(type: Copy) {
from 'jsword/src/main/resources', 'src/stage/resources'
from 'jsword/src/main/resources'
from 'src/stage/resources'
into 'src/main/resources'
}
tasks.compileJava.dependsOn(mergeSources)
tasks.compileJava.dependsOn(mergeResources)
dependencies {
compile 'commons-net:commons-net:3.3'
@ -43,10 +50,3 @@ dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
}
shadowJar {
dependencies {
include(dependency('org.apache.httpcomponents:httpclient:4.3.2'))
}
relocate 'org.apache.http', 'org.apache.shaded.http'
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

48
jsword-minimalbible.iml
View File

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="true" />
</configuration>
</facet>
</component>
@ -18,28 +14,28 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-net:commons-net:3.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.6" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.commons:commons-compress:1.7" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpclient:4.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.jdom:jdom2:2.0.5" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-core:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-analyzers:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-snowball:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-smartcn:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.tukaani:xz:1.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-codec:commons-codec:1.6" level="project" />
<orderEntry type="library" exported="" name="commons-net-3.3" level="project" />
<orderEntry type="library" exported="" name="commons-compress-1.7" level="project" />
<orderEntry type="library" exported="" name="httpcore-4.3.2" level="project" />
<orderEntry type="library" exported="" name="httpclient-4.3.2" level="project" />
<orderEntry type="library" exported="" name="slf4j-api-1.7.6" level="project" />
<orderEntry type="library" exported="" name="jdom2-2.0.5" level="project" />
<orderEntry type="library" exported="" name="lucene-core-3.0.3" level="project" />
<orderEntry type="library" exported="" name="lucene-analyzers-3.0.3" level="project" />
<orderEntry type="library" exported="" name="lucene-snowball-3.0.3" level="project" />
<orderEntry type="library" exported="" name="lucene-smartcn-3.0.3" level="project" />
<orderEntry type="library" exported="" name="xz-1.4" level="project" />
<orderEntry type="library" exported="" name="commons-logging-1.1.3" level="project" />
<orderEntry type="library" exported="" name="commons-codec-1.6" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="jsword-minimalbible.jsword-minimalbible-1.0-SNAPSHOT" level="project" />
</component>
</module>