From b8a31c3faf2ae2da4d7d62f45f15d7c4e90baf7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 14 Jul 2018 20:09:58 +0200
Subject: [PATCH] Upgrade android SDK (#144)

---
 .circleci/config.yml         |  2 +-
 app/android-sonarqube.gradle |  2 +-
 app/build.gradle             | 27 +++++++++++++--------------
 build.gradle                 | 14 ++++++--------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b017fe23..387c5edd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-27-alpha
     working_directory: *workspace_root
     environment:
       environment:
diff --git a/app/android-sonarqube.gradle b/app/android-sonarqube.gradle
index 3ad2c5ff..b9284eea 100644
--- a/app/android-sonarqube.gradle
+++ b/app/android-sonarqube.gradle
@@ -5,7 +5,7 @@ sonarqube {
     //noinspection GroovyAssignabilityCheck
     properties {
         def files = fileTree("${rootProject.projectDir}/api/build/libs/").filter { it.isFile() }.files.name
-        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-26/android.jar," +
+        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-27/android.jar," +
                 "${project.rootDir}/api/build/libs/" + files[0]
 
         property "sonar.projectName", GROUP_ID + ":app"
diff --git a/app/build.gradle b/app/build.gradle
index df08a23e..82d426af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,13 @@
+apply plugin: 'org.greenrobot.greendao'
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt' // sync warning probably caused by bug https://issuetracker.google.com/issues/74537216
+apply plugin: 'io.fabric'
+apply from: 'jacoco.gradle'
+apply from: 'android-sonarqube.gradle'
+apply plugin: 'com.google.gms.oss.licenses.plugin'
+apply plugin: 'com.github.triplet.play'
+
 buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
@@ -17,18 +27,8 @@ repositories {
     maven { url 'https://maven.fabric.io/public' }
 }
 
-apply plugin: 'org.greenrobot.greendao'
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt' // sync warning probably caused by bug https://issuetracker.google.com/issues/74537216
-apply plugin: 'io.fabric'
-apply from: 'jacoco.gradle'
-apply from: 'android-sonarqube.gradle'
-apply plugin: 'com.google.gms.oss.licenses.plugin'
-apply plugin: 'com.github.triplet.play'
-
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '27.0.3'
 
     playAccountConfigs {
@@ -42,7 +42,7 @@ android {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 14
         versionName "0.5.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -103,6 +103,7 @@ configurations.all {
 
 dependencies {
     implementation project(':api')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "com.android.support:support-v4:$supportVersion"
     implementation "com.android.support:design:$supportVersion"
     implementation "com.android.support:cardview-v7:$supportVersion"
@@ -119,7 +120,6 @@ dependencies {
     implementation "com.aurelhubert:ahbottomnavigation:$ahbottom"
     implementation "com.jakewharton.threetenabp:threetenabp:$threeTenABP"
     implementation "com.google.android.gms:play-services-oss-licenses:$ossLicenses"
-
     implementation "com.jakewharton.timber:timber:$timber"
     implementation "at.favre.lib:slf4j-timber:$slf4jTimber"
 
@@ -130,7 +130,6 @@ dependencies {
         transitive = true
     }
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     kapt "com.google.dagger:dagger-compiler:$dagger2"
     kapt "com.google.dagger:dagger-android-processor:$dagger2"
     kapt "com.jakewharton:butterknife-compiler:$butterknife"
diff --git a/build.gradle b/build.gradle
index 2815bd0f..353dc70f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,13 +36,12 @@ subprojects {
 ext {
     GROUP_ID = "io.github.wulkanowy"
 
-    supportVersion = "26.1.0"
-    flexibleAdapter = "5.0.2"
-    flexibleUi = "1.0.0-b2"
-
+    supportVersion = "27.1.1"
+    flexibleAdapter = "5.0.5"
+    flexibleUi = "1.0.0-b5"
     firebaseJob = "0.8.5"
     apacheLang = "3.7"
-    apacheCollections = "4.1"
+    apacheCollections = "4.2"
     greenDao = "3.2.2"
     greenDaoHelper = "v2.0.2"
     greenDaoGradle = "3.2.2"
@@ -52,8 +51,7 @@ ext {
     ahbottom = "2.2.0"
     jsoup = "1.11.3"
     gson = "2.8.5"
-    ossLicenses = "15.0.1"
-
+    ossLicenses = "16.0.0"
     slf4jApi = "1.7.25"
     slf4jTimber = "1.0.1"
     timber = "4.7.1"
@@ -61,7 +59,7 @@ ext {
     debugDb = "1.0.4"
 
     junit = "4.12"
-    mockito = "2.19.0"
+    mockito = "2.19.1"
     testRunner = "1.0.2"
 
     fabricGradle = "1.25.4"