From 08dd0d5695d64609c3de6cfad91d13467d35f8f9 Mon Sep 17 00:00:00 2001 From: Brent Kensey Date: Sat, 28 Jun 2014 20:22:05 -0400 Subject: [PATCH] Update build.gradle for Android Studio 0.8 including new error fixes --- Backbone/build.gradle | 58 ++++++++----------- .../main/res/layout/fso_properties_drawer.xml | 1 - Backbone/src/main/res/values-af/strings.xml | 2 - Backbone/src/main/res/values-cs/strings.xml | 1 - Backbone/src/main/res/values-da/strings.xml | 1 - Backbone/src/main/res/values-de/strings.xml | 1 - Backbone/src/main/res/values-el/strings.xml | 1 - Backbone/src/main/res/values-es/strings.xml | 1 - Backbone/src/main/res/values-fi/strings.xml | 1 - Backbone/src/main/res/values-fr/strings.xml | 1 - Backbone/src/main/res/values-hu/strings.xml | 1 - Backbone/src/main/res/values-it/strings.xml | 1 - Backbone/src/main/res/values-iw/strings.xml | 2 - Backbone/src/main/res/values-ja/strings.xml | 2 - Backbone/src/main/res/values-nb/strings.xml | 1 - Backbone/src/main/res/values-nl/strings.xml | 1 - Backbone/src/main/res/values-pl/strings.xml | 1 - .../src/main/res/values-pt-rBR/strings.xml | 1 - .../src/main/res/values-pt-rPT/strings.xml | 2 - Backbone/src/main/res/values-ro/strings.xml | 1 - Backbone/src/main/res/values-ru/strings.xml | 1 - Backbone/src/main/res/values-sk/strings.xml | 2 - Backbone/src/main/res/values-sr/strings.xml | 2 - Backbone/src/main/res/values-sv/strings.xml | 1 - Backbone/src/main/res/values-uk/strings.xml | 1 - .../src/main/res/values-zh-rCN/strings.xml | 1 - Backbone/src/main/res/values/strings.xml | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 28 files changed, 28 insertions(+), 69 deletions(-) diff --git a/Backbone/build.gradle b/Backbone/build.gradle index 5c1f7187a..c55dab00a 100644 --- a/Backbone/build.gradle +++ b/Backbone/build.gradle @@ -11,10 +11,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } -apply plugin: 'android' +apply plugin: 'com.android.application' /* mavenCentral() is specified at this level in addition to the buildscript block above so that Gradle knows which repository to use when resolving the dependancies listed below. See answer in @@ -24,25 +24,17 @@ repositories { } dependencies { - compile 'com.android.support:support-v4:13.0.0' - compile 'de.greenrobot:eventbus:2.2.0' + compile 'com.android.support:support-v4:19.0.1' + compile 'de.greenrobot:eventbus:2.2.1' compile files('libs/dashclock-api-r2.0.jar') } android { - compileSdkVersion 17 - buildToolsVersion "17.0.0" - - final SEARCHES_PROVIDER_DEBUG = "me.toolify.backbone.debug.providers.recentsearches" - final SEARCHES_PROVIDER_RELEASE = "me.toolify.backbone.providers.recentsearches" - final SEARCHES_PROVIDER_ALPHA = "me.toolify.backbone.alpha.providers.recentsearches" - - final BOOKMARKS_PROVIDER_DEBUG = "me.toolify.backbone.debug.providers.bookmarks" - final BOOKMARKS_PROVIDER_RELEASE = "me.toolify.backbone.providers.bookmarks" - final BOOKMARKS_PROVIDER_ALPHA = "me.toolify.backbone.alpha.providers.bookmarks" + compileSdkVersion 19 + buildToolsVersion '19.1.0' defaultConfig { - packageName "me.toolify.backbone" + applicationId "me.toolify.backbone" versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild versionName "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}" minSdkVersion 14 @@ -62,24 +54,26 @@ android { https://plus.google.com/118417777153109946393/posts/EATUmhntaCQ */ buildTypes { debug { - buildConfig "public static final String SEARCHES_PROVIDER_AUTHORITY = \"" + SEARCHES_PROVIDER_DEBUG + "\";" + - "public static final String BOOKMARKS_PROVIDER_AUTHORITY = \"" + BOOKMARKS_PROVIDER_DEBUG + "\";" - packageNameSuffix ".debug" + buildConfigField "String" , "SEARCHES_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.debug.providers.recentsearches\"" + buildConfigField "String" , "BOOKMARKS_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.debug.providers.bookmarks\"" + applicationIdSuffix ".debug" versionNameSuffix "-debug" + debuggable true } release { - buildConfig "public static final String SEARCHES_PROVIDER_AUTHORITY = \"" + SEARCHES_PROVIDER_RELEASE + "\";" + - "public static final String BOOKMARKS_PROVIDER_AUTHORITY = \"" + BOOKMARKS_PROVIDER_RELEASE + "\";" + buildConfigField "String" , "SEARCHES_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.providers.recentsearches\"" + buildConfigField "String" , "BOOKMARKS_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.providers.bookmarks\"" signingConfig signingConfigs.release } alpha.initWith(buildTypes.release) // base alpha buildType on release buildType alpha { - buildConfig "public static final String SEARCHES_PROVIDER_AUTHORITY = \"" + SEARCHES_PROVIDER_ALPHA + "\";" + - "public static final String BOOKMARKS_PROVIDER_AUTHORITY = \"" + BOOKMARKS_PROVIDER_ALPHA + "\";" - packageNameSuffix ".alpha" + buildConfigField "String" , "SEARCHES_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.alpha.providers.recentsearches\"" + buildConfigField "String" , "BOOKMARKS_PROVIDER_AUTHORITY" , "\"me.toolify.backbone.alpha.providers.bookmarks\"" + applicationIdSuffix ".alpha" versionNameSuffix "-alpha" + debuggable true } } @@ -112,26 +106,20 @@ android { sourceSets { main { - resources.srcDirs = ['libs/color-picker-view/src','libs/android-syntax-highlight/src','themes/src'] + main.resources.srcDirs = ['libs/color-picker-view/src','libs/android-syntax-highlight/src','themes/src', 'src/main/res'] } // Merge in build type specific resources debug { - res.srcDirs = [ - 'src/main/res', - 'src/debug/res'] + resources.srcDirs = ['src/debug/res'] } release { - res.srcDirs = [ - 'src/main/res', - 'src/release/res'] + resources.srcDirs = ['src/release/res'] } alpha { - res.srcDirs = [ - 'src/main/res', - 'src/alpha/res'] + resources.srcDirs = ['src/alpha/res'] } } @@ -156,5 +144,5 @@ android { } task wrapper(type: Wrapper) { - gradleVersion = '1.8' -} + gradleVersion = '1.12' +} \ No newline at end of file diff --git a/Backbone/src/main/res/layout/fso_properties_drawer.xml b/Backbone/src/main/res/layout/fso_properties_drawer.xml index e99f98bd5..225b4fc4f 100644 --- a/Backbone/src/main/res/layout/fso_properties_drawer.xml +++ b/Backbone/src/main/res/layout/fso_properties_drawer.xml @@ -328,7 +328,6 @@ Hernoem - Maak \'n kopie - Eienskappe Voeg by boekmerke diff --git a/Backbone/src/main/res/values-cs/strings.xml b/Backbone/src/main/res/values-cs/strings.xml index f822017c7..f5471c338 100644 --- a/Backbone/src/main/res/values-cs/strings.xml +++ b/Backbone/src/main/res/values-cs/strings.xml @@ -247,7 +247,6 @@ Rozbalit Smazat Přejmenovat - Vytvořit kopii Vlastnosti Přidat do záložek Přidat zástupce diff --git a/Backbone/src/main/res/values-da/strings.xml b/Backbone/src/main/res/values-da/strings.xml index ab9985914..907c1193b 100644 --- a/Backbone/src/main/res/values-da/strings.xml +++ b/Backbone/src/main/res/values-da/strings.xml @@ -235,7 +235,6 @@ Udpak Slet Omdøb - Opret kopi Egenskaber Tilføj til bogmærker Tilføj genvej diff --git a/Backbone/src/main/res/values-de/strings.xml b/Backbone/src/main/res/values-de/strings.xml index 8bd1e5e9b..d06398740 100644 --- a/Backbone/src/main/res/values-de/strings.xml +++ b/Backbone/src/main/res/values-de/strings.xml @@ -225,7 +225,6 @@ Entpacken Löschen Umbenennen - Kopie erstellen Eigenschaften Neues Lesezeichen Neue Verknüpfung diff --git a/Backbone/src/main/res/values-el/strings.xml b/Backbone/src/main/res/values-el/strings.xml index ec2fb43d2..5f9a4a19c 100644 --- a/Backbone/src/main/res/values-el/strings.xml +++ b/Backbone/src/main/res/values-el/strings.xml @@ -223,7 +223,6 @@ Αποσυμπίεση Διαγραφή Μετονομασία - Δημ. αντίγραφου Ιδιότητες Προσθ. στους σελιδοδείκτες Προσθήκη συντόμευσης diff --git a/Backbone/src/main/res/values-es/strings.xml b/Backbone/src/main/res/values-es/strings.xml index 376fcf62f..b078ae437 100644 --- a/Backbone/src/main/res/values-es/strings.xml +++ b/Backbone/src/main/res/values-es/strings.xml @@ -235,7 +235,6 @@ Extraer Borrar Renombrar - Crear copia Propiedades A marcadores Acceso directo diff --git a/Backbone/src/main/res/values-fi/strings.xml b/Backbone/src/main/res/values-fi/strings.xml index 3cd013b33..815a59dfb 100644 --- a/Backbone/src/main/res/values-fi/strings.xml +++ b/Backbone/src/main/res/values-fi/strings.xml @@ -227,7 +227,6 @@ Pura Poista Uudelleennimeä - Luo kopio Ominaisuudet Lisää kirjanmerkkeihin Luo pikakuvake diff --git a/Backbone/src/main/res/values-fr/strings.xml b/Backbone/src/main/res/values-fr/strings.xml index 912bed690..6f57110fa 100644 --- a/Backbone/src/main/res/values-fr/strings.xml +++ b/Backbone/src/main/res/values-fr/strings.xml @@ -233,7 +233,6 @@ Extraire Supprimer Renommer - Dupliquer Propriétés Ajouter aux favoris Ajouter un raccourci diff --git a/Backbone/src/main/res/values-hu/strings.xml b/Backbone/src/main/res/values-hu/strings.xml index 31bc30fc2..63080d363 100644 --- a/Backbone/src/main/res/values-hu/strings.xml +++ b/Backbone/src/main/res/values-hu/strings.xml @@ -224,7 +224,6 @@ Kicsomagolás Törlés Átnevezés - Másolat létrehozása Tulajdonságok Hozzáadás a könyvjelzőkhöz Parancsikon létrehozása diff --git a/Backbone/src/main/res/values-it/strings.xml b/Backbone/src/main/res/values-it/strings.xml index 86373cd33..53810405b 100644 --- a/Backbone/src/main/res/values-it/strings.xml +++ b/Backbone/src/main/res/values-it/strings.xml @@ -239,7 +239,6 @@ Estrai Elimina Rinomina - Crea copia Proprietà Aggiungi segnalibro Aggiungi collegamento diff --git a/Backbone/src/main/res/values-iw/strings.xml b/Backbone/src/main/res/values-iw/strings.xml index 44e92504f..8a44cb580 100644 --- a/Backbone/src/main/res/values-iw/strings.xml +++ b/Backbone/src/main/res/values-iw/strings.xml @@ -462,8 +462,6 @@ מחק שנה שם - - צור עותק מאפיינים diff --git a/Backbone/src/main/res/values-ja/strings.xml b/Backbone/src/main/res/values-ja/strings.xml index 406c56a32..9d1b80ce3 100644 --- a/Backbone/src/main/res/values-ja/strings.xml +++ b/Backbone/src/main/res/values-ja/strings.xml @@ -480,8 +480,6 @@ 削除 リネーム - - コピーを作成 プロパティ diff --git a/Backbone/src/main/res/values-nb/strings.xml b/Backbone/src/main/res/values-nb/strings.xml index 630c6a8c7..4191ee3a0 100644 --- a/Backbone/src/main/res/values-nb/strings.xml +++ b/Backbone/src/main/res/values-nb/strings.xml @@ -226,7 +226,6 @@ Pakk ut Slett Gi nytt navn - Lag kopi Egenskaper Legg til bokmerke Legg til snarvei diff --git a/Backbone/src/main/res/values-nl/strings.xml b/Backbone/src/main/res/values-nl/strings.xml index 1c50d992c..b6292de5b 100644 --- a/Backbone/src/main/res/values-nl/strings.xml +++ b/Backbone/src/main/res/values-nl/strings.xml @@ -223,7 +223,6 @@ Uitpakken Verwijderen Naam wijzigen - Kopie maken Eigenschappen Favoriet maken Snelkoppeling maken diff --git a/Backbone/src/main/res/values-pl/strings.xml b/Backbone/src/main/res/values-pl/strings.xml index 6e6acfd9d..d8096562f 100644 --- a/Backbone/src/main/res/values-pl/strings.xml +++ b/Backbone/src/main/res/values-pl/strings.xml @@ -264,7 +264,6 @@ Wyodrębnij Usuń Zmień nazwę - Utwórz kopię Właściwości Dodaj do zakładek Utwórz skrót diff --git a/Backbone/src/main/res/values-pt-rBR/strings.xml b/Backbone/src/main/res/values-pt-rBR/strings.xml index 0630886b5..4c10e5d7f 100644 --- a/Backbone/src/main/res/values-pt-rBR/strings.xml +++ b/Backbone/src/main/res/values-pt-rBR/strings.xml @@ -196,7 +196,6 @@ Extrair Excluir Renomear - Criar cópia Propriedades Adicionar aos favoritos Adicionar atalho diff --git a/Backbone/src/main/res/values-pt-rPT/strings.xml b/Backbone/src/main/res/values-pt-rPT/strings.xml index 736d7d477..2fc6ae70c 100644 --- a/Backbone/src/main/res/values-pt-rPT/strings.xml +++ b/Backbone/src/main/res/values-pt-rPT/strings.xml @@ -494,8 +494,6 @@ Remover Renomear - - Criar cópia Propriedades diff --git a/Backbone/src/main/res/values-ro/strings.xml b/Backbone/src/main/res/values-ro/strings.xml index eaa280719..1004c31ee 100644 --- a/Backbone/src/main/res/values-ro/strings.xml +++ b/Backbone/src/main/res/values-ro/strings.xml @@ -198,7 +198,6 @@ Extragere Ştergere Redenumire - Creare copie Proprietăţi Adăugare la marcaje Adăugare comandă rapidă diff --git a/Backbone/src/main/res/values-ru/strings.xml b/Backbone/src/main/res/values-ru/strings.xml index 0b27a4a88..a025b3eb0 100644 --- a/Backbone/src/main/res/values-ru/strings.xml +++ b/Backbone/src/main/res/values-ru/strings.xml @@ -264,7 +264,6 @@ Извлечь Удалить Переименовать - Создать копию Свойства Добавить в закладки Поместить на главный экран diff --git a/Backbone/src/main/res/values-sk/strings.xml b/Backbone/src/main/res/values-sk/strings.xml index 89c2c791b..5500d40cd 100644 --- a/Backbone/src/main/res/values-sk/strings.xml +++ b/Backbone/src/main/res/values-sk/strings.xml @@ -463,8 +463,6 @@ Odstrániť Premenovať - - Vytvoriť kópiu Vlastnosti diff --git a/Backbone/src/main/res/values-sr/strings.xml b/Backbone/src/main/res/values-sr/strings.xml index a3b44e389..3f4270f3b 100644 --- a/Backbone/src/main/res/values-sr/strings.xml +++ b/Backbone/src/main/res/values-sr/strings.xml @@ -500,8 +500,6 @@ Избриши Преименуј - - Направи копију Особине diff --git a/Backbone/src/main/res/values-sv/strings.xml b/Backbone/src/main/res/values-sv/strings.xml index 4ff809325..1827077a3 100644 --- a/Backbone/src/main/res/values-sv/strings.xml +++ b/Backbone/src/main/res/values-sv/strings.xml @@ -249,7 +249,6 @@ Extrahera Radera Byt namn - Skapa kopia Egenskaper Lägg till bokmärken Lägg till genväg diff --git a/Backbone/src/main/res/values-uk/strings.xml b/Backbone/src/main/res/values-uk/strings.xml index 850efc4d1..4572c4d49 100644 --- a/Backbone/src/main/res/values-uk/strings.xml +++ b/Backbone/src/main/res/values-uk/strings.xml @@ -258,7 +258,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> Видобути Видалити Перейменувати - Копіювати Властивості Додати до закладок Додати ярлик diff --git a/Backbone/src/main/res/values-zh-rCN/strings.xml b/Backbone/src/main/res/values-zh-rCN/strings.xml index a46978a14..73697a080 100644 --- a/Backbone/src/main/res/values-zh-rCN/strings.xml +++ b/Backbone/src/main/res/values-zh-rCN/strings.xml @@ -275,7 +275,6 @@ 解压 删除 重命名 - 创建副本 属性 添加到书签 添加快捷方式 diff --git a/Backbone/src/main/res/values/strings.xml b/Backbone/src/main/res/values/strings.xml index df158852d..705e70e23 100644 --- a/Backbone/src/main/res/values/strings.xml +++ b/Backbone/src/main/res/values/strings.xml @@ -15,7 +15,9 @@ limitations under the License. --> - +> A 4.0+ file manager. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 365f0a268..69777f8ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Dec 07 14:37:43 EST 2013 +#Sat Jun 28 10:40:49 EDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip