Merge branch 'development'

.travis.yml

@@ -11,7 +11,7 @@ android:
     - tools
     - platform-tools
     - android-25
-    - build-tools-25.0.2
+    - build-tools-27.0.3
     - extra-google-m2repository
     - extra-android-m2repository
 

VERSION

@@ -1 +1 @@
-051:3.2.1
+052:3.3.0

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "org.indywidualni.fblite"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 51
-        versionName "3.2.1"
+        versionCode 52
+        versionName "3.3.0"
     }
     buildTypes {
         release {
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'org.jsoup:jsoup:1.9.2'
-    compile 'ch.acra:acra:4.9.0'
-    compile 'com.github.johnkil.android-appmsg:appmsg:1.2.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:support-v4:25.3.1'
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'org.jsoup:jsoup:1.9.2'
+    implementation 'ch.acra:acra:4.9.0'
+    implementation 'com.github.johnkil.android-appmsg:appmsg:1.2.0'
 }

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":52,"versionName":"3.3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +16,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun May 14 01:37:31 CEST 2017
+#Sun Apr 08 12:34:45 CEST 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