Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt our gradle setup to the new v4-preferencefragment location

Browse Source
This commit is contained in:
Daniel Martí 2015-04-01 11:28:36 +02:00
parent 6159013b36
commit 2ce62aac65
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
F-Droid/build.gradle
View File

@ -33,7 +33,7 @@ if ( !hasProperty( 'sourceDeps' ) ) {
// Upstream doesn't have a binary on mavenCentral/jcenter yet: // Upstream doesn't have a binary on mavenCentral/jcenter yet:
// https://github.com/kolavar/android-support-v4-preferencefragment/issues/13 // https://github.com/kolavar/android-support-v4-preferencefragment/issues/13
compile(name: 'android-support-v4-preferencefragment-release', ext: 'aar') compile(name: 'support-v4-preferencefragment-release', ext: 'aar')
// Fork for F-Droid, including support for https. Not merged into upstream // Fork for F-Droid, including support for https. Not merged into upstream
// yet (seems to be a little unsupported as of late), so not using mavenCentral/jcenter. // yet (seems to be a little unsupported as of late), so not using mavenCentral/jcenter.
@ -64,7 +64,7 @@ if ( !hasProperty( 'sourceDeps' ) ) {
compile project(':extern:jmdns') compile project(':extern:jmdns')
compile project(':extern:zipsigner') compile project(':extern:zipsigner')
compile project(':extern:zxing-core') compile project(':extern:zxing-core')
compile( project(':extern:android-support-v4-preferencefragment') ) { compile( project(':extern:support-v4-preferencefragment') ) {
exclude module: 'support-v4' exclude module: 'support-v4'
} }
@ -106,7 +106,7 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
description = "Copies .jar and .aar files from subproject dependencies in extern/ to F-Droid/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")" description = "Copies .jar and .aar files from subproject dependencies in extern/ to F-Droid/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")"
from ('../extern/' ) { from ('../extern/' ) {
include 'android-support-v4-preferencefragment/build/outputs/aar/android-support-v4-preferencefragment-release.aar', include 'support-v4-preferencefragment/build/outputs/aar/support-v4-preferencefragment-release.aar',
'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar', 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar',
'zipsigner/build/libs/zipsigner.jar', 'zipsigner/build/libs/zipsigner.jar',
'jmdns/build/libs/jmdns.jar', 'jmdns/build/libs/jmdns.jar',

2
settings.gradle
View File

@ -11,5 +11,5 @@ if ( hasProperty( 'sourceDeps' ) ) {
include ':extern:spongycastle:pkix' include ':extern:spongycastle:pkix'
include ':extern:spongycastle:prov' include ':extern:spongycastle:prov'
include ':extern:zxing-core' include ':extern:zxing-core'
include ':extern:android-support-v4-preferencefragment' include ':extern:support-v4-preferencefragment'
} }