diff --git a/.travis.yml b/.travis.yml index 38c054b..433947d 100644 --- a/.travis.yml +++ b/.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 diff --git a/VERSION b/VERSION index 7b2299d..bc19a7a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -051:3.2.1 \ No newline at end of file +052:3.3.0 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 9af336c..487fdac 100644 --- a/app/build.gradle +++ b/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' } diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..ab1dca8 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..b713e30 --- /dev/null +++ b/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":{}}] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5966013..ac08900 100644 --- a/build.gradle +++ b/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() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a61c075..267e4c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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