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

Commit e0fa2a84 authored by korelstar's avatar korelstar Committed by Niedermann IT-Dienstleistungen
Browse files

update dependencies (android, support libraries, cert4android)

parent e68dbe1e

.travis.yml

+5 −2
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ jdk: oraclejdk8 
android:

  components:

    - tools

    - build-tools-26.0.2

    - android-26

    - build-tools-27.0.3

    - android-27

    - extra-android-m2repository



before_install:

    - yes | sdkmanager "platforms;android-27"



script: ./gradlew testDebug

app/build.gradle

+4 −3
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 26

    compileSdkVersion 27

    buildToolsVersion '27.0.3'



    defaultConfig {

        applicationId "it.niedermann.owncloud.notes"

        minSdkVersion 14

        targetSdkVersion 26

        targetSdkVersion 27

        versionCode 20

        versionName "0.13.1"

    }
@@ -27,7 +28,7 @@ dependencies { 


    compile 'com.yydcdut:rxmarkdown:0.1.1-beta'



    def supportLibVersion = '26.1.0'

    def supportLibVersion = '27.0.2'

    compile "com.android.support:support-v4:${supportLibVersion}"

    compile "com.android.support:appcompat-v7:${supportLibVersion}"

    compile "com.android.support:design:${supportLibVersion}"

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ import android.os.Bundle; 
import android.preference.PreferenceManager;

import android.support.annotation.Nullable;

import android.support.design.widget.Snackbar;

import android.support.v4.app.NotificationCompat;

import android.support.v4.view.MenuItemCompat;

import android.support.v4.widget.DrawerLayout;

import android.support.v4.widget.SwipeRefreshLayout;

import android.support.v7.app.ActionBarDrawerToggle;

import android.support.v7.app.AppCompatActivity;

import android.support.v7.app.NotificationCompat;

import android.support.v7.view.ActionMode;

import android.support.v7.widget.LinearLayoutManager;

import android.support.v7.widget.RecyclerView;

app/src/main/java/it/niedermann/owncloud/notes/util/SupportUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -87,6 +87,6 @@ public class SupportUtil { 
    @WorkerThread

    public static CustomCertManager getCertManager(Context ctx) {

        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);

        return new CustomCertManager(ctx, preferences.getBoolean(ctx.getString(R.string.pref_key_trust_system_certs), true), null);

        return new CustomCertManager(ctx, preferences.getBoolean(ctx.getString(R.string.pref_key_trust_system_certs), true));

    }

}

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
    }

    dependencies {

        apply plugin: 'maven'

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

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



        // NOTE: Do not place your application dependencies here; they belong

        // in the individual module build.gradle files