Merge pull request #28 from MakinGiants/release/1.4.5

Release/1.4.5

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+# 1.4.5
+- Update support library 25.1.1.
+- Crashlytics and fabric.
+
 # 1.4.4
 - Update
 

README.md

@@ -1,6 +1,7 @@
 # Android Banjo Tuner [Google Play](https://play.google.com/store/apps/details?id=com.makingiants.android.banjotuner)
-- master [![codecov](https://codecov.io/gh/MakinGiants/banjen/branch/master/graph/badge.svg)](https://codecov.io/gh/MakinGiants/banjen)
-- develop [![codecov](https://codecov.io/gh/MakinGiants/banjen/branch/develop/graph/badge.svg)](https://codecov.io/gh/MakinGiants/banjen)
+[![codecov](https://codecov.io/gh/MakinGiants/banjen/branch/master/graph/badge.svg)](https://codecov.io/gh/MakinGiants/banjen)
+[![codecov](https://codecov.io/gh/MakinGiants/banjen/branch/develop/graph/badge.svg)](https://codecov.io/gh/MakinGiants/banjen)
+[![codebeat badge](https://codebeat.co/badges/b1f343ee-4b9a-48a4-b41b-bb58cc5f949a)](https://codebeat.co/projects/github-com-makingiants-banjen)
 
 Android app to help to tune a 4 string banjo
 

app/build.gradle

@@ -7,12 +7,12 @@ buildscript {
   }
 
   dependencies {
-    classpath 'io.fabric.tools:gradle:1.22.0'
+    classpath 'io.fabric.tools:gradle:1.22.1'
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$deps.kotlin"
     classpath "org.jetbrains.kotlin:kotlin-android-extensions:$deps.kotlin"
     classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
-    classpath 'gradle.plugin.com.nimbledroid:gradle-profiler:1.0.9'
+    classpath 'gradle.plugin.com.nimbledroid:gradle-profiler:1.1.0'
   }
 }
 
@@ -26,22 +26,13 @@ apply from: '../jacoco.gradle'
 apply plugin: 'com.nimbledroid.profiler'
 
 def appId = "com.makingiants.android.banjotuner"
-def appVersionName = "1.4.4"
-def appVersionCode = 20
+def appVersionName = "1.4.5"
+def appVersionCode = 21
 
 android {
   compileSdkVersion setup.targetSdk
   buildToolsVersion setup.buildTools
 
-  //  signingConfigs {
-  //    release {
-  //      storeFile file(BANJEN_SIGN_PATH)
-  //      storePassword BANJEN_SIGN_PWD
-  //      keyAlias BANJEN_SIGN_ALIAS
-  //      keyPassword BANJEN_SIGN_PWD
-  //    }
-  //  }
-
   defaultConfig {
     applicationId appId
     minSdkVersion setup.minSdk
@@ -70,7 +61,6 @@ android {
       shrinkResources true
       useProguard true
 
-      //      signingConfig signingConfigs.release
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
   }
@@ -91,7 +81,7 @@ dependencies {
 
   compile "org.jetbrains.kotlin:kotlin-stdlib:$deps.kotlin"
 
-  compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') { transitive = true; }
+  compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') { transitive = true; }
 
   testCompile 'junit:junit:4.12'
   testCompile "org.jetbrains.kotlin:kotlin-stdlib:$deps.kotlin"
@@ -100,10 +90,10 @@ dependencies {
   androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
     exclude group: 'com.android.support', module: 'support-annotations'
   })
-  androidTestCompile('com.jraska:falcon-spoon-compat:1.0.3') {
+  androidTestCompile('com.jraska:falcon-spoon-compat:1.0.4') {
     exclude group: 'com.squareup.spoon', module: 'spoon-client'
   }
-  androidTestCompile 'com.squareup.spoon:spoon-client:1.7.0'
+  androidTestCompile 'com.squareup.spoon:spoon-client:1.7.1'
 
   androidTestCompile('com.android.support.test:runner:0.5') {
     exclude group: 'com.android.support', module: 'support-annotations'
@@ -113,9 +103,9 @@ dependencies {
   }
 }
 
-jacoco {
-  toolVersion = "0.7.4.201502262128"
-}
+//jacoco {
+//  toolVersion = "0.7.4.201502262128"
+//}
 
 spoon {
   debug = true

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   ext.deps = [kotlin      : "1.0.6",
-              supportLib  : "25.1.0",
+              supportLib  : "25.1.1",
               playServices: "10.0.1"]
 
   ext.setup = [targetSdk : 25,

circle.yml

@@ -1,30 +1,40 @@
 machine:
   environment:
-    PATH: "~/$CIRCLE_PROJECT_REPONAME/gradle-2.14.1/bin:$PATH"
+    GRADLE_VERSION: "gradle-2.13"
+    PATH: "~/$CIRCLE_PROJECT_REPONAME/$GRADLE_VERSION/bin:$PATH"
     TERM: "dumb"
     ADB_INSTALL_TIMEOUT: "10"
     GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 dependencies:
+  cache_directories:
+    - ~/.gradle
+    - ~/.android
   pre:
-    - wget "https://services.gradle.org/distributions/gradle-2.14.1-bin.zip"; unzip gradle-2.14.1-bin.zip
-    - echo y | android update sdk --no-ui --all --filter android-25,build-tools-25.0.2,tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository
-    - sh cp-env-to-properties.sh
+    - wget "https://services.gradle.org/distributions/$GRADLE_VERSION-bin.zip"; unzip $GRADLE_VERSION-bin.zip
+    - sh scripts/install-deps.sh
+    - sh scripts/cp-env-to-properties.sh
 
-test:
-  override:
+compile:
+  pre:
     # start the emulator
-    - mksdcard -l e 512M mysdcard.img # Screenshots
+    - mksdcard -l e 128M mysdcard.img # Spoon screenshots
 
     - emulator -avd circleci-android22 -no-audio -no-window -sdcard mysdcard.img:
         background: true
         parallel: true
 
+  override:
+    - ./gradlew assembleDebug --stacktrace -PdisablePreDex --no-daemon --console=plain
+
+test:
+  override:
     - circle-android wait-for-boot
 
     # unlock the emulator screen
     - sleep 30
     - adb shell input keyevent 82
+    - adb shell input touchscreen swipe 370 735 371 735
 
     # run tests  against the emulator.
     - ./gradlew spoonDebugAndroidTest -PdisablePreDex --stacktrace
@@ -39,6 +49,6 @@ test:
 
 deployment:
   staging:
-    branch: /^release.*$/
+    branch: /^release\$*/
     commands:
       - ./gradlew ndUpload -PdisablePreDex #upload to nimbledroid

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Jan 11 11:01:34 COT 2017
+#Mon Feb 06 16:59:34 BRST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

scripts/install-deps.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# Install required dependencies
+# $ANDROID_HOME must be set to be cached on CI setup
+#
+
+DEPS_FILE="$ANDROID_HOME/android-dependencies-installed"
+
+if [ ! -e $DEPS_FILE ]; then
+
+  for I in android-25 \
+           build-tools-25.0.2  \
+           tool \
+           extra-android-m2repository \
+           extra-android-support \
+           extra-google-google_play_services \
+           extra-google-m2repository;
+   do echo y | android update sdk --no-ui --all --filter $I ; done
+
+   touch DEPS_FILE;
+
+ fi