mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few things

Browse source
This commit is contained in:
Mario Danic 2017-04-09 10:38:37 +02:00 committed by tobiasKaminsky
parent 047bd3cc8e
commit 8ef8a68a86
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -13,7 +13,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.google.gms:google-services:3.0.0' classpath 'com.google.gms:google-services:3.0.0'
} }
} }
@ -37,14 +37,12 @@ ext {
preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
} }
configurations.all {
// Check for updates every build
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
repositories { repositories {
jcenter() jcenter()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
flatDir { flatDir {
dirs 'libs' dirs 'libs'
@ -103,7 +101,7 @@ android {
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
dexOptions { dexOptions {
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. // Skip pre-dexing whe`n running on Travis CI or when disabled via -Dpre-dex=false.
preDexLibraries = preDexEnabled && !travisBuild preDexLibraries = preDexEnabled && !travisBuild
} }

2
src/main/res/values/setup.xml
View file

@ -123,7 +123,7 @@
<bool name="use_home">false</bool> <bool name="use_home">false</bool>
<!-- Push server url --> <!-- Push server url -->
<string name="push_server_url" translatable="true"></string> <string name="push_server_url" translatable="false"></string>
</resources> </resources>