diff --git a/.travis.yml b/.travis.yml index 5131ae9a0..d50b37e38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,10 @@ android: - tools # The BuildTools version used by your project - - build-tools-25.0.3 + - build-tools-26.0.1 # The SDK version used to compile your project - - android-25 + - android-26 # Additional components - extra-google-google_play_services diff --git a/Habitica/build.gradle b/Habitica/build.gradle index cf261da75..8d81a4249 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -138,8 +138,8 @@ dependencies { } android { - compileSdkVersion 26 - buildToolsVersion "26.0.1" + compileSdkVersion sdk_version + buildToolsVersion build_tools_version defaultConfig { applicationId "com.habitrpg.android.habitica" @@ -181,6 +181,7 @@ android { productFlavors { dev { minSdkVersion 21 + buildConfigField "String", "STAGING_KEY", "\"1dcf9ed3-3b14-45b3-9e7e-acdfff68a368\"" } prod { diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml index b43712cb9..8b7f0ba11 100644 --- a/Habitica/res/layout/dialog_purchase_content_gear.xml +++ b/Habitica/res/layout/dialog_purchase_content_gear.xml @@ -15,7 +15,7 @@ android:layout_width="@dimen/shopitem_image_size" android:layout_height="@dimen/shopitem_image_size" /> diff --git a/Habitica/res/layout/item_item.xml b/Habitica/res/layout/item_item.xml index 066949ca3..3e68c8900 100644 --- a/Habitica/res/layout/item_item.xml +++ b/Habitica/res/layout/item_item.xml @@ -7,7 +7,7 @@ style="@style/RowWrapper" android:clickable="true">