Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0c25471 authored by Unpublished's avatar Unpublished Committed by Marten Gajda
Browse files

Bump deps (#798)

* Bump support_lib_version from 26.1.0 to 28.0.0
* Bump support_test_runner_version from 0.5 to 1.0.2
* Bump mockito-core from 2.10.0 to 2.27.0
* Migrate to AndroidX
* Bump appcompat from 1.0.0 to 1.0.2
* Bump androidx_test_runner_version from 1.1.0 to 1.1.1
parent ae18cc64
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ android:
    - tools
    - build-tools-28.0.3
    - android-24
    - android-26
    - android-28
    - extra
    - extra-android-m2repository
    - sys-img-armeabi-v7a-android-24
+7 −8
Original line number Diff line number Diff line
def support_lib_version = '26.1.0'
def jems_version = '1.18'
def contentpal_version = 'a7fbc62eef' //  a7fbc62eef -> 2018-08-19
def support_test_runner_version = '0.5'
def androidx_test_runner_version = '1.1.1'

ext.deps = [
        // Support & Google libraries
        support_appcompat  : "com.android.support:appcompat-v7:$support_lib_version",
        support_annotations: "com.android.support:support-annotations:$support_lib_version",
        support_design     : "com.android.support:design:$support_lib_version",
        support_appcompat  : 'androidx.appcompat:appcompat:1.0.2',
        support_annotations: 'androidx.annotation:annotation:1.0.0',
        support_design     : 'com.google.android.material:material:1.0.0',
        android_dashclock  : 'com.google.android.apps.dashclock:dashclock-api:2.0.0',

        // dmfs
@@ -26,10 +25,10 @@ ext.deps = [
        // Testing
        junit              : 'junit:junit:4.12',
        hamcrest           : 'org.hamcrest:hamcrest-all:1.3',
        mockito            : 'org.mockito:mockito-core:2.10.0',
        mockito            : 'org.mockito:mockito-core:2.27.0',
        robolectric        : 'org.robolectric:robolectric:3.5.1',
        support_test_runner: "com.android.support.test:runner:$support_test_runner_version",
        support_test_rules : "com.android.support.test:rules:$support_test_runner_version",
        support_test_runner: "androidx.test:runner:$androidx_test_runner_version",
        support_test_rules : "androidx.test:rules:$androidx_test_runner_version",

        // dmfs testing
        jems_testing       : "org.dmfs:jems-testing:$jems_version",
+3 −1
Original line number Diff line number Diff line
COMPILE_SDK_VERSION=26
COMPILE_SDK_VERSION=28
MIN_SDK_VERSION=15
TARGET_SDK_VERSION=26
VERSION_OVERRIDE=0
android.enableJetifier=true
android.useAndroidX=true
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ android {
        minSdkVersion MIN_SDK_VERSION.toInteger()
        targetSdkVersion TARGET_SDK_VERSION.toInteger()

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }
    buildTypes {
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ android {
        minSdkVersion MIN_SDK_VERSION.toInteger()
        targetSdkVersion TARGET_SDK_VERSION.toInteger()

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }
    buildTypes {
Loading