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

Commit 50aa218a authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update libraries; target SDK level 29

parent 8ad6a3db

build.gradle

+10 −10
Original line number Original line Diff line number Diff line 




buildscript {

buildscript {

    ext.versions = [

    ext.versions = [

        kotlin: '1.3.41',

        kotlin: '1.3.50',

        dokka: '0.9.18',

        dokka: '0.9.18',

        conscrypt: '2.1.0'

        conscrypt: '2.2.1'

    ]

    ]





    repositories {

    repositories {
@@ -12,7 +12,7 @@ buildscript { 
    }

    }





    dependencies {

    dependencies {

        classpath 'com.android.tools.build:gradle:3.4.2'

        classpath 'com.android.tools.build:gradle:3.5.0'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"

    }

    }
@@ -28,12 +28,12 @@ apply plugin: 'kotlin-android' 
apply plugin: 'org.jetbrains.dokka-android'

apply plugin: 'org.jetbrains.dokka-android'





android {

android {

    compileSdkVersion 28

    compileSdkVersion 29

    buildToolsVersion '29.0.1'

    buildToolsVersion '29.0.1'





    defaultConfig {

    defaultConfig {

        minSdkVersion 14

        minSdkVersion 14

        targetSdkVersion 28

        targetSdkVersion 29

    }

    }





    compileOptions {

    compileOptions {
@@ -56,16 +56,16 @@ android { 
dependencies {

dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"





    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'

    implementation 'androidx.appcompat:appcompat:1.1.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'

    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'

    implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'

    implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"

    implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"





    androidTestImplementation 'androidx.test:runner:1.2.0'

    androidTestImplementation 'androidx.test:runner:1.2.0'

    androidTestImplementation 'androidx.test:rules:1.2.0'

    androidTestImplementation 'androidx.test:rules:1.2.0'

    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.3'

    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.5'

    androidTestImplementation 'commons-io:commons-io:2.6'

    androidTestImplementation 'commons-io:commons-io:2.6'

    androidTestImplementation 'org.apache.commons:commons-lang3:3.9'

    androidTestImplementation 'org.apache.commons:commons-lang3:3.9'

src/test/java/at/bitfire/cert4android/CertUtilsTest.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ class CertUtilsTest { 
    fun getTag() {

    fun getTag() {

        val factory = CertificateFactory.getInstance("X.509")

        val factory = CertificateFactory.getInstance("X.509")





        javaClass.classLoader.getResourceAsStream("davdroid-web.crt").use { stream ->

        javaClass.classLoader!!.getResourceAsStream("davdroid-web.crt").use { stream ->

            val cert = factory.generateCertificate(stream) as X509Certificate

            val cert = factory.generateCertificate(stream) as X509Certificate

            assertNotNull(cert)

            assertNotNull(cert)