Gradle build now working on Windows

This commit is contained in:
DjBushido 2014-04-30 12:40:37 -04:00
parent 034252fd4d
commit a47d007ccb
7 changed files with 27 additions and 10 deletions

View File

@ -8,7 +8,7 @@
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

View File

@ -24,10 +24,6 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name="org.bspeice.minimalbible.activities.downloader.DownloaderActivity"
android:label="@string/title_activity_downloader" >
</activity>
<activity <activity
android:name="org.bspeice.minimalbible.activities.downloader.DownloadActivity" android:name="org.bspeice.minimalbible.activities.downloader.DownloadActivity"
android:label="@string/title_activity_download" > android:label="@string/title_activity_download" >

View File

@ -51,7 +51,6 @@
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/.settings" /> <excludeFolder url="file://$MODULE_DIR$/.settings" />
<excludeFolder url="file://$MODULE_DIR$/build/apk" /> <excludeFolder url="file://$MODULE_DIR$/build/apk" />
<excludeFolder url="file://$MODULE_DIR$/build/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/assets" />
@ -68,6 +67,10 @@
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" /> <orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="1_android-support-v4" level="project" />
<orderEntry type="library" exported="" name="eventbus-2.2.0" level="project" />
<orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
<orderEntry type="library" exported="" name="jsword" level="project" />
<orderEntry type="library" exported="" name="android-support-v7-appcompat" level="project" /> <orderEntry type="library" exported="" name="android-support-v7-appcompat" level="project" />
<orderEntry type="module" module-name="appcompat_v7" exported="" /> <orderEntry type="module" module-name="appcompat_v7" exported="" />
</component> </component>

View File

@ -1,10 +1,8 @@
apply plugin: 'android' apply plugin: 'android'
dependencies {
compile fileTree(dir: 'libs', include: '*.jar') { dependencies {
builtBy 'minimalBibleJSword' compile fileTree(dir: 'libs', include: '*.jar')
}
compile project(':appcompat_v7') compile project(':appcompat_v7')
} }
@ -35,6 +33,14 @@ android {
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
} }
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
}
} }
task minimalBibleJSword (type: GradleBuild) { GradleBuild antBuild -> task minimalBibleJSword (type: GradleBuild) { GradleBuild antBuild ->

7
MinimalBible/lint.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<!-- Disable this given check in this project -->
<issue id="InvalidPackage">
<ignore path="libs/jsword.jar"/>
</issue>
</lint>

View File

@ -14,6 +14,7 @@
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
<option name="LIBRARY_PROJECT" value="true" /> <option name="LIBRARY_PROJECT" value="true" />
</configuration> </configuration>
</facet> </facet>

View File

@ -31,4 +31,8 @@ android {
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
} }
lintOptions {
abortOnError false
}
} }