diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1788ca59..928856f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ image: openjdk:8-jdk variables: - ANDROID_TARGET_SDK: "26" - ANDROID_BUILD_TOOLS: "27.0.0" + ANDROID_TARGET_SDK: "27" + ANDROID_BUILD_TOOLS: "27.0.1" ANDROID_SDK_TOOLS_REV: "3859397" before_script: diff --git a/app/build.gradle b/app/build.gradle index d6341ed7..5d19f14f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion "27.0.0" + compileSdkVersion 27 + buildToolsVersion "27.0.1" defaultConfig { vectorDrawables.useSupportLibrary = true applicationId "gr.thmmy.mthmmy" minSdkVersion 19 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 11 versionName "1.3.3" archivesBaseName = "mTHMMY-v$versionName" @@ -27,28 +27,28 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support:design:26.1.0' - compile 'com.android.support:support-v4:26.1.0' - compile 'com.android.support:cardview-v7:26.1.0' - compile 'com.android.support:recyclerview-v7:26.1.0' - compile 'com.google.firebase:firebase-crash:11.4.2' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'com.squareup.picasso:picasso:2.5.2' - compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' - compile 'org.jsoup:jsoup:1.10.3' - compile 'com.github.franmontiel:PersistentCookieJar:v1.0.1' - compile 'com.github.PhilJay:MPAndroidChart:v3.0.2' - compile('com.mikepenz:materialdrawer:5.9.3@aar') { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.0.1' + implementation 'com.android.support:design:27.0.1' + implementation 'com.android.support:support-v4:27.0.1' + implementation 'com.android.support:cardview-v7:27.0.1' + implementation 'com.android.support:recyclerview-v7:27.0.1' + implementation 'com.google.firebase:firebase-crash:11.6.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'com.squareup.picasso:picasso:2.5.2' + implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' + implementation 'org.jsoup:jsoup:1.11.1' + implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1' + implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2' + implementation("com.mikepenz:materialdrawer:6.0.1@aar") { transitive = true } - compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar' - compile 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' - compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7' - compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement! - compile 'me.zhanghai.android.materialprogressbar:library:1.4.2' - compile 'com.jakewharton.timber:timber:4.5.1' + implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar' + implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.8' + implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement! + implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2' + implementation 'com.jakewharton.timber:timber:4.6.0' } if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")){ diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html index 090b8039..817ee602 100644 --- a/app/src/main/assets/apache_libraries.html +++ b/app/src/main/assets/apache_libraries.html @@ -51,7 +51,7 @@
MPAndroidChart v3.0.2 (Copyright ©2016 Philipp Jahoda)
  • -
    MaterialDrawer v5.9.3 (Copyright ©2016 Mike Penz)
    +
    MaterialDrawer v6.0.1 (Copyright ©2016 Mike Penz)
  • Android-Iconics v2.9.5 (Copyright ©2016 Mike Penz)
    @@ -59,6 +59,9 @@
  • MaterialProgressBar v1.4.2 (Copyright ©2015 Zhang Hai)
    • +
  • +
    Timber v4.6.0 (Copyright ©2013 Jake Wharton)
    +
    • diff --git a/app/src/main/assets/mit_libraries.html b/app/src/main/assets/mit_libraries.html index c0fa7697..76527173 100644 --- a/app/src/main/assets/mit_libraries.html +++ b/app/src/main/assets/mit_libraries.html @@ -39,10 +39,10 @@