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

Commit 6d1653df authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Update to compileSdkVersion 28 to fix build

parent 13191e82
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ test:
build:
  stage: build
  script:
  - ./gradlew build -x test
  - ./gradlew assemble
  artifacts:
    paths:
    - app/build/outputs/apk/
+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ def getTestProp(String propName) {


android {
    compileSdkVersion 26
    compileSdkVersion 28
    defaultConfig {
        applicationId "foundation.e.drive"
        minSdkVersion 26
@@ -63,9 +63,9 @@ dependencies {

    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test:rules:1.0.2'
    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
    androidTestImplementation 'androidx.annotation:annotation:1.3.0'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
    api 'com.android.support:support-annotations:27.1.1'
    api 'androidx.annotation:annotation:1.3.0'
    api project(':NextcloudLib')

    //start to add lib for test - 1/4/21
+3 −1
Original line number Diff line number Diff line
@@ -11,8 +11,10 @@ package foundation.e.drive.operations;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.VisibleForTesting;
import android.util.Log;

import androidx.annotation.VisibleForTesting;

import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.UserInfo;
import com.owncloud.android.lib.common.operations.RemoteOperation;
+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ import android.content.ContentProvider;
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;


/**
+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ import android.content.ContentProvider;
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

/**
 *
Loading