Merge branch 'alpha1' into 'master'
version bumps before alpha1 The more we test these updates the better, so the best moment to update libs is now. See merge request !338
This commit is contained in:
commit
780c3968b5
@ -1,4 +1,4 @@
|
|||||||
image: mvdan/fdroid-ci:client-20160613
|
image: mvdan/fdroid-ci:client-20160617
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
|
@ -20,17 +20,17 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compile project(':privileged-api-lib')
|
compile project(':privileged-api-lib')
|
||||||
|
|
||||||
compile 'com.android.support:support-v4:23.4.0'
|
compile 'com.android.support:support-v4:24.0.0'
|
||||||
compile 'com.android.support:appcompat-v7:23.4.0'
|
compile 'com.android.support:appcompat-v7:24.0.0'
|
||||||
compile 'com.android.support:support-annotations:23.4.0'
|
compile 'com.android.support:support-annotations:24.0.0'
|
||||||
|
|
||||||
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
||||||
compile 'com.google.zxing:core:3.2.1'
|
compile 'com.google.zxing:core:3.2.1'
|
||||||
compile 'eu.chainfire:libsuperuser:1.0.0.201602271131'
|
compile 'eu.chainfire:libsuperuser:1.0.0.201602271131'
|
||||||
compile 'cc.mvdan.accesspoint:library:0.2.0'
|
compile 'cc.mvdan.accesspoint:library:0.2.0'
|
||||||
compile 'info.guardianproject.netcipher:netcipher:1.2.1'
|
compile 'info.guardianproject.netcipher:netcipher:1.2.1'
|
||||||
compile 'commons-io:commons-io:2.4'
|
compile 'commons-io:commons-io:2.5'
|
||||||
compile 'commons-net:commons-net:3.4'
|
compile 'commons-net:commons-net:3.5'
|
||||||
compile 'org.openhab.jmdns:jmdns:3.4.2'
|
compile 'org.openhab.jmdns:jmdns:3.4.2'
|
||||||
compile('ch.acra:acra:4.8.5') {
|
compile('ch.acra:acra:4.8.5') {
|
||||||
exclude module: 'support-v4'
|
exclude module: 'support-v4'
|
||||||
@ -41,12 +41,11 @@ dependencies {
|
|||||||
|
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
|
|
||||||
// 3.1-rc1 is required because it is the first to implements API v23.
|
testCompile "org.robolectric:robolectric:3.1"
|
||||||
testCompile "org.robolectric:robolectric:3.1-rc1"
|
|
||||||
|
|
||||||
testCompile "org.mockito:mockito-core:1.10.19"
|
testCompile "org.mockito:mockito-core:1.10.19"
|
||||||
|
|
||||||
androidTestCompile 'com.android.support:support-annotations:23.4.0'
|
androidTestCompile 'com.android.support:support-annotations:24.0.0'
|
||||||
androidTestCompile 'com.android.support.test:runner:0.5'
|
androidTestCompile 'com.android.support.test:runner:0.5'
|
||||||
androidTestCompile 'com.android.support.test:rules:0.5'
|
androidTestCompile 'com.android.support.test:rules:0.5'
|
||||||
}
|
}
|
||||||
@ -85,15 +84,15 @@ if (!hasProperty('sourceDeps')) {
|
|||||||
// source code don't need to be here.
|
// source code don't need to be here.
|
||||||
dependencyVerification {
|
dependencyVerification {
|
||||||
verify = [
|
verify = [
|
||||||
'com.android.support:support-v4:a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a',
|
'com.android.support:support-v4:b6d3994d4bdea0ef2a221ecf9e0ddf150b99af189211c36418c81e248f3fed99',
|
||||||
'com.android.support:appcompat-v7:d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba',
|
'com.android.support:appcompat-v7:a30898bbec4d506f821055a362d62820b18f29e9cf0c077817e46cb5a03cde94',
|
||||||
'com.android.support:support-annotations:e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01',
|
'com.android.support:support-annotations:0790aced70e3ce82a6e466f0d4908cdd9e21bd925b4107437441d201f595a908',
|
||||||
'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4',
|
'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4',
|
||||||
'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
|
'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
|
||||||
'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128',
|
'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128',
|
||||||
'cc.mvdan.accesspoint:library:0837b38adb48b66bb1385adb6ade8ecce7002ad815c55abf13517c82193458ea',
|
'cc.mvdan.accesspoint:library:0837b38adb48b66bb1385adb6ade8ecce7002ad815c55abf13517c82193458ea',
|
||||||
'commons-io:commons-io:cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581',
|
'commons-io:commons-io:a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474',
|
||||||
'commons-net:commons-net:38cf2eca826b8bcdb236fc1f2e79e0c6dd8e7e0f5c44a3b8e839a1065b2fbe2e',
|
'commons-net:commons-net:c25b0da668b3c5649f002d504def22d1b4cb30d206f05428d2fe168fa1a901c2',
|
||||||
'info.guardianproject.netcipher:netcipher:611ec5bde9d799fd57e1efec5c375f9f460de2cdda98918541decc9a7d02f2ad',
|
'info.guardianproject.netcipher:netcipher:611ec5bde9d799fd57e1efec5c375f9f460de2cdda98918541decc9a7d02f2ad',
|
||||||
'org.openhab.jmdns:jmdns:7a4b34b5606bbd2aff7fdfe629edcb0416fccd367fb59a099f210b9aba4f0bce',
|
'org.openhab.jmdns:jmdns:7a4b34b5606bbd2aff7fdfe629edcb0416fccd367fb59a099f210b9aba4f0bce',
|
||||||
'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905',
|
'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905',
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 681 B |
Binary file not shown.
Before Width: | Height: | Size: 462 B |
Binary file not shown.
Before Width: | Height: | Size: 526 B |
Binary file not shown.
Before Width: | Height: | Size: 801 B |
Binary file not shown.
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.2 KiB |
Loading…
x
Reference in New Issue
Block a user