Merge pull request #35 from Longi94/v2.0.2-offline-images

v2.0.2 offline images

.gitignore

@@ -52,3 +52,5 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+
+/keys.properties

.travis.yml

@@ -1,52 +1,24 @@
+sudo: required
 language: android
 android:
   components:
-    # Uncomment the lines below if you want to
-    # use the latest revision of Android SDK Tools
-    # - platform-tools
     - tools
-
-    # The BuildTools version used by your project
     - build-tools-23.0.2
-
-    # The SDK version used to compile your project
     - android-23
-    - android-22
-
-    # Additional components
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    # - addon-google_apis-google-19
-
-    # Specify at least one system image,
-    # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-android-22
-
-env:
-  global:
-    # install timeout in minutes (2 minutes by default)
-    - ADB_INSTALL_TIMEOUT=8
 
 before_install:
   - chmod +x gradlew
   - pip install --user codecov
-  - android list sdk --no-ui --all --extended
-  - android list targets
-
-# Emulator Management: Create, Start and Wait
-before_script:
-  - echo no | android create avd --force --name test --target android-22 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window -gpu off &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew build connectedCheck --stacktrace
-  #  - ./gradlew assembleDebug
-
+  - ./gradlew build
+
 after_success:
   - codecov
 
 notifications:
-  email: false
+  email:
+    on_failure: change

app/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
 
+def getKey(Properties properties, String name) {
+    return properties.containsKey(name) ? properties.getProperty(name) : "DUMMY_KEY"
+}
+
 android {
     compileSdkVersion 23
     buildToolsVersion '23.0.2'
@@ -8,17 +12,24 @@ android {
         applicationId "com.tlongdev.bktf"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 37
-        versionName "2.0.1"
+        versionCode 38
+        versionName "2.0.2"
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
                 output.outputFile = new File(output.outputFile.parent, "bptf-" + versionName + ".apk")
             }
         }
 
-        buildConfigField("String", "BACKPACK_TF_API_KEY", "\"${rootProject.property("BACKPACK_TF_API_KEY")}\"")
-        buildConfigField("String", "STEAM_WEB_API_KEY", "\"${rootProject.property("STEAM_WEB_API_KEY")}\"")
+        vectorDrawables.useSupportLibrary = true
+
+        Properties keys = new Properties()
+        if (project.rootProject.file('keys.properties').exists()) {
+            keys.load(project.rootProject.file('keys.properties').newDataInputStream())
+        }
+
+        buildConfigField("String", "BACKPACK_TF_API_KEY", "\"${getKey(keys, "BACKPACK_TF_API_KEY")}\"")
+        buildConfigField("String", "STEAM_WEB_API_KEY", "\"${getKey(keys, "STEAM_WEB_API_KEY")}\"")
     }
     buildTypes {
         release {
@@ -34,21 +45,24 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+    lintOptions {
+        disable 'InvalidPackage'
+    }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:cardview-v7:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:support-v4:23.2.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'com.android.support:cardview-v7:23.2.1'
+    compile 'com.android.support:recyclerview-v7:23.2.1'
+    compile 'com.android.support:design:23.2.1'
     compile 'com.google.android.gms:play-services-analytics:8.4.0'
     compile 'com.google.android.gms:play-services-gcm:8.4.0'
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.0'
+    compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.squareup.okhttp3:okhttp:3.1.1'
+    compile 'com.squareup.okhttp3:okhttp:3.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'