diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 851425b8..00ccd514 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,13 @@ image: openjdk:8-jdk variables: ANDROID_TARGET_SDK: "26" - ANDROID_BUILD_TOOLS: "26.0.1" - ANDROID_SDK_TOOLS: "25.2.5" + ANDROID_BUILD_TOOLS: "26.0.2" + ANDROID_SDK_TOOLS: "3859397" before_script: - apt-get --quiet update --yes - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - unzip android-sdk.zip -d android-sdk-linux - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_TARGET_SDK} - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools diff --git a/app/build.gradle b/app/build.gradle index 719a0366..9fb5f481 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { vectorDrawables.useSupportLibrary = true @@ -28,25 +28,25 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.0.0' - compile 'com.android.support:design:26.0.0' - compile 'com.android.support:support-v4:26.0.0' - compile 'com.android.support:cardview-v7:26.0.0' - compile 'com.android.support:recyclerview-v7:26.0.0' - compile 'com.google.firebase:firebase-crash:10.2.6' - compile 'com.squareup.okhttp3:okhttp:3.8.0' + 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.0.4' + 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.2' + 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.2@aar') { + compile('com.mikepenz:materialdrawer:5.9.3@aar') { transitive = true } compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@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.1' + compile 'me.zhanghai.android.materialprogressbar:library:1.4.2' compile 'com.jakewharton.timber:timber:4.5.1' } diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html index 45905fa2..0fd5216e 100644 --- a/app/src/main/assets/apache_libraries.html +++ b/app/src/main/assets/apache_libraries.html @@ -39,7 +39,7 @@ diff --git a/app/src/main/assets/mit_libraries.html b/app/src/main/assets/mit_libraries.html index 42b46e78..c0fa7697 100644 --- a/app/src/main/assets/mit_libraries.html +++ b/app/src/main/assets/mit_libraries.html @@ -39,7 +39,7 @@