Skip to content

Update build.gradle for Android Studio 0.8 including new error fixes #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkensey wants to merge 1 commit into
base: dev-alpha
Choose a base branch
from
Open

Update build.gradle for Android Studio 0.8 including new error fixes #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 23 additions & 35 deletions Backbone/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Copy link

@BrandoCommando BrandoCommando Jun 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why only 19.0.1? My Studio says 21 is available.

Copy link

@BrandoCommando BrandoCommando Jun 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind. Looks like it doesn't build when the latest reported version (20.0.0rc1).

Copy link
Author

@bkensey bkensey Jun 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't really check in depth. I was just following an Android Studio suggestion, and I assume it was pointing to the latest stable release.

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
Expand All @@ -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
}
}

Expand Down Expand Up @@ -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']
}
}

Expand All @@ -156,5 +144,5 @@ android {
}

task wrapper(type: Wrapper) {
gradleVersion = '1.8'
}
gradleVersion = '1.12'
}
1 change: 0 additions & 1 deletion Backbone/src/main/res/layout/fso_properties_drawer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@
</TableLayout>

<TextView
android:id="@+id/bookmarks_item_separator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/default_margin"
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-af/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,6 @@
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">Hernoem</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">Maak \'n kopie</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">Eienskappe</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
<string name="actions_menu_add_to_bookmarks">Voeg by boekmerke</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@
<string name="actions_menu_extract">Rozbalit</string>
<string name="actions_menu_delete">Smazat</string>
<string name="actions_menu_rename">Přejmenovat</string>
<string name="actions_menu_create_copy">Vytvořit kopii</string>
<string name="actions_menu_properties">Vlastnosti</string>
<string name="actions_menu_add_to_bookmarks">Přidat do záložek</string>
<string name="actions_menu_add_shortcut">Přidat zástupce</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@
<string name="actions_menu_extract">Udpak</string>
<string name="actions_menu_delete">Slet</string>
<string name="actions_menu_rename">Omdøb</string>
<string name="actions_menu_create_copy">Opret kopi</string>
<string name="actions_menu_properties">Egenskaber</string>
<string name="actions_menu_add_to_bookmarks">Tilføj til bogmærker</string>
<string name="actions_menu_add_shortcut">Tilføj genvej</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@
<string name="actions_menu_extract">Entpacken</string>
<string name="actions_menu_delete">Löschen</string>
<string name="actions_menu_rename">Umbenennen</string>
<string name="actions_menu_create_copy">Kopie erstellen</string>
<string name="actions_menu_properties">Eigenschaften</string>
<string name="actions_menu_add_to_bookmarks">Neues Lesezeichen</string>
<string name="actions_menu_add_shortcut">Neue Verknüpfung</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-el/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@
<string name="actions_menu_extract">Αποσυμπίεση</string>
<string name="actions_menu_delete">Διαγραφή</string>
<string name="actions_menu_rename">Μετονομασία</string>
<string name="actions_menu_create_copy">Δημ. αντίγραφου</string>
<string name="actions_menu_properties">Ιδιότητες</string>
<string name="actions_menu_add_to_bookmarks">Προσθ. στους σελιδοδείκτες</string>
<string name="actions_menu_add_shortcut">Προσθήκη συντόμευσης</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@
<string name="actions_menu_extract">Extraer</string>
<string name="actions_menu_delete">Borrar</string>
<string name="actions_menu_rename">Renombrar</string>
<string name="actions_menu_create_copy">Crear copia</string>
<string name="actions_menu_properties">Propiedades</string>
<string name="actions_menu_add_to_bookmarks">A marcadores</string>
<string name="actions_menu_add_shortcut">Acceso directo</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-fi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
<string name="actions_menu_extract">Pura</string>
<string name="actions_menu_delete">Poista</string>
<string name="actions_menu_rename">Uudelleennimeä</string>
<string name="actions_menu_create_copy">Luo kopio</string>
<string name="actions_menu_properties">Ominaisuudet</string>
<string name="actions_menu_add_to_bookmarks">Lisää kirjanmerkkeihin</string>
<string name="actions_menu_add_shortcut">Luo pikakuvake</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@
<string name="actions_menu_extract">Extraire</string>
<string name="actions_menu_delete">Supprimer</string>
<string name="actions_menu_rename">Renommer</string>
<string name="actions_menu_create_copy">Dupliquer</string>
<string name="actions_menu_properties">Propriétés</string>
<string name="actions_menu_add_to_bookmarks">Ajouter aux favoris</string>
<string name="actions_menu_add_shortcut">Ajouter un raccourci</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-hu/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
<string name="actions_menu_extract">Kicsomagolás</string>
<string name="actions_menu_delete">Törlés</string>
<string name="actions_menu_rename">Átnevezés</string>
<string name="actions_menu_create_copy">Másolat létrehozása</string>
<string name="actions_menu_properties">Tulajdonságok</string>
<string name="actions_menu_add_to_bookmarks">Hozzáadás a könyvjelzőkhöz</string>
<string name="actions_menu_add_shortcut">Parancsikon létrehozása</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-it/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
<string name="actions_menu_extract">Estrai</string>
<string name="actions_menu_delete">Elimina</string>
<string name="actions_menu_rename">Rinomina</string>
<string name="actions_menu_create_copy">Crea copia</string>
<string name="actions_menu_properties">Proprietà</string>
<string name="actions_menu_add_to_bookmarks">Aggiungi segnalibro</string>
<string name="actions_menu_add_shortcut">Aggiungi collegamento</string>
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-iw/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,6 @@
<string name="actions_menu_delete">מחק</string>
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">שנה שם</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">צור עותק</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">מאפיינים</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,6 @@
<string name="actions_menu_delete">削除</string>
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">リネーム</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">コピーを作成</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">プロパティ</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-nb/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@
<string name="actions_menu_extract">Pakk ut</string>
<string name="actions_menu_delete">Slett</string>
<string name="actions_menu_rename">Gi nytt navn</string>
<string name="actions_menu_create_copy">Lag kopi</string>
<string name="actions_menu_properties">Egenskaper</string>
<string name="actions_menu_add_to_bookmarks">Legg til bokmerke</string>
<string name="actions_menu_add_shortcut">Legg til snarvei</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-nl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@
<string name="actions_menu_extract">Uitpakken</string>
<string name="actions_menu_delete">Verwijderen</string>
<string name="actions_menu_rename">Naam wijzigen</string>
<string name="actions_menu_create_copy">Kopie maken</string>
<string name="actions_menu_properties">Eigenschappen</string>
<string name="actions_menu_add_to_bookmarks">Favoriet maken</string>
<string name="actions_menu_add_shortcut">Snelkoppeling maken</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-pl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@
<string name="actions_menu_extract">Wyodrębnij</string>
<string name="actions_menu_delete">Usuń</string>
<string name="actions_menu_rename">Zmień nazwę</string>
<string name="actions_menu_create_copy">Utwórz kopię</string>
<string name="actions_menu_properties">Właściwości</string>
<string name="actions_menu_add_to_bookmarks">Dodaj do zakładek</string>
<string name="actions_menu_add_shortcut">Utwórz skrót</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-pt-rBR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@
<string name="actions_menu_extract">Extrair</string>
<string name="actions_menu_delete">Excluir</string>
<string name="actions_menu_rename">Renomear</string>
<string name="actions_menu_create_copy">Criar cópia</string>
<string name="actions_menu_properties">Propriedades</string>
<string name="actions_menu_add_to_bookmarks">Adicionar aos favoritos</string>
<string name="actions_menu_add_shortcut">Adicionar atalho</string>
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-pt-rPT/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,6 @@
<string name="actions_menu_delete">Remover</string>
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">Renomear</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">Criar cópia</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">Propriedades</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-ro/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@
<string name="actions_menu_extract">Extragere</string>
<string name="actions_menu_delete">Ştergere</string>
<string name="actions_menu_rename">Redenumire</string>
<string name="actions_menu_create_copy">Creare copie</string>
<string name="actions_menu_properties">Proprietăţi</string>
<string name="actions_menu_add_to_bookmarks">Adăugare la marcaje</string>
<string name="actions_menu_add_shortcut">Adăugare comandă rapidă</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@
<string name="actions_menu_extract">Извлечь</string>
<string name="actions_menu_delete">Удалить</string>
<string name="actions_menu_rename">Переименовать</string>
<string name="actions_menu_create_copy">Создать копию</string>
<string name="actions_menu_properties">Свойства</string>
<string name="actions_menu_add_to_bookmarks">Добавить в закладки</string>
<string name="actions_menu_add_shortcut">Поместить на главный экран</string>
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-sk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,6 @@
<string name="actions_menu_delete">Odstrániť</string>
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">Premenovať</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">Vytvoriť kópiu</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">Vlastnosti</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
Expand Down
2 changes: 0 additions & 2 deletions Backbone/src/main/res/values-sr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,6 @@
<string name="actions_menu_delete">Избриши</string>
<!-- Actions Dialog * Menu * Rename -->
<string name="actions_menu_rename">Преименуј</string>
<!-- Actions Dialog * Menu * Create copy -->
<string name="actions_menu_create_copy">Направи копију</string>
<!-- Actions Dialog * Menu * Properties -->
<string name="actions_menu_properties">Особине</string>
<!-- Actions Dialog * Menu * Add to bookmarks -->
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-sv/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
<string name="actions_menu_extract">Extrahera</string>
<string name="actions_menu_delete">Radera</string>
<string name="actions_menu_rename">Byt namn</string>
<string name="actions_menu_create_copy">Skapa kopia</string>
<string name="actions_menu_properties">Egenskaper</string>
<string name="actions_menu_add_to_bookmarks">Lägg till bokmärken</string>
<string name="actions_menu_add_shortcut">Lägg till genväg</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-uk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="actions_menu_extract">Видобути</string>
<string name="actions_menu_delete">Видалити</string>
<string name="actions_menu_rename">Перейменувати</string>
<string name="actions_menu_create_copy">Копіювати</string>
<string name="actions_menu_properties">Властивості</string>
<string name="actions_menu_add_to_bookmarks">Додати до закладок</string>
<string name="actions_menu_add_shortcut">Додати ярлик</string>
Expand Down
1 change: 0 additions & 1 deletion Backbone/src/main/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@
<string name="actions_menu_extract">解压</string>
<string name="actions_menu_delete">删除</string>
<string name="actions_menu_rename">重命名</string>
<string name="actions_menu_create_copy">创建副本</string>
<string name="actions_menu_properties">属性</string>
<string name="actions_menu_add_to_bookmarks">添加到书签</string>
<string name="actions_menu_add_shortcut">添加快捷方式</string>
Expand Down
4 changes: 3 additions & 1 deletion Backbone/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
limitations under the License.
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingTranslation">>

<!-- The description of the application -->
<string name="app_description">A 4.0+ file manager.</string>
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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