Merge pull request #117 from martinohanlon/dev

android app sdk uplift
martinohanlon · Nov 18, 2018 · 0ca40cc · 0ca40cc
2 parents afaac7d + e718689
commit 0ca40cc
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/clients/android/.idea/misc.xml b/clients/android/.idea/misc.xml
diff --git a/clients/android/app/build.gradle b/clients/android/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "com.stuffaboutcode.bluedot"
         minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 2
-        versionName "1.1"
+        targetSdkVersion 27
+        versionCode 3
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -24,7 +24,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.1'
+    compile 'com.android.support:appcompat-v7:27.1.1'
+    compile 'com.android.support.constraint:constraint-layout:1.1.3'
     testCompile 'junit:junit:4.12'
 }
diff --git a/clients/android/app/release/app-release.apk b/clients/android/app/release/app-release.apk
diff --git a/clients/android/app/release/output.json b/clients/android/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/clients/android/app/src/main/AndroidManifest.xml b/clients/android/app/src/main/AndroidManifest.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stuffaboutcode.bluedot"
-    android:versionName="0.0.2 (alpha)"
-    android:versionCode="2">
+    android:versionName="1.1.1"
+    android:versionCode="3">
 
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-sdk android:minSdkVersion="5" />
+    <uses-sdk
+        android:minSdkVersion="5"
+        android:targetSdkVersion="27"/>
 
     <application
         android:allowBackup="true"

diff --git a/clients/android/build.gradle b/clients/android/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }

diff --git a/clients/android/gradle/wrapper/gradle-wrapper.properties b/clients/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Mar 26 11:41:36 BST 2017
+#Fri Sep 21 14:32:14 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -138,6 +138,11 @@ Alpha - initial testing
 Android app
 -----------
 
+3 (1.1.1) - 2018-09-21
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+ * Android SDK version uplift (due to google play store minimum requirements change).
+
 2 (1.1) - 2017-11-05
 ~~~~~~~~~~~~~~~~~~~~~~~~
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]