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

Unverified Commit 37e97a51 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #292 from nextcloud/dependabot/gradle/com.squareup.retrofit2-retrofit-2.9.0 

Bump retrofit from 2.6.4 to 2.9.0
parents 7a27033b 84403635

.github/dependabot.yml

+0 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ updates: 
  - 2. to review

  - dependencies

  ignore:

  - dependency-name: com.squareup.okhttp3:okhttp

    versions:

    - ">= 3.13.a"

    - "< 3.14"

  - dependency-name: com.squareup.okhttp3:okhttp

    versions:

    - ">= 3.14.a"

    - "< 3.15"

  - dependency-name: com.squareup.okhttp3:okhttp

    versions:

    - ">= 4.a"
 
    - "< 5"

build.gradle

+3 −7
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ android { 
    compileSdkVersion 29

    buildToolsVersion "29.0.3"

    defaultConfig {

        minSdkVersion 14

        minSdkVersion 21

        targetSdkVersion 29

        versionCode 1

        versionName '1.0'
@@ -139,12 +139,8 @@ dependencies { 


    implementation 'commons-io:commons-io:2.8.0'



    implementation ('com.squareup.retrofit2:retrofit:2.6.4') {

        because '2.7.0 requires okhttp:3.14.x which requires API level 19'

    }

    implementation ('com.squareup.okhttp3:okhttp:3.12.12') {

        because '3.13+ requires Lollipop, but our minSdkVersion is 14'

    }

    implementation 'com.squareup.retrofit2:retrofit:2.9.0'

    implementation 'com.squareup.okhttp3:okhttp:3.12.12'



    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'

    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'

src/main/java/com/nextcloud/android/sso/helper/BufferedSourceSSO.java

+0 −4
Original line number Diff line number Diff line
@@ -45,12 +45,10 @@ public class BufferedSourceSSO implements BufferedSource { 
        throw new UnsupportedOperationException("Not implemented");

    }



    /*

    @Override

    public Buffer getBuffer() {

        return buffer();

    }

    */



    @Override

    public boolean exhausted() throws IOException {
@@ -253,12 +251,10 @@ public class BufferedSourceSSO implements BufferedSource { 
        throw new UnsupportedOperationException("Not implemented");

    }



    /*

    @Override

    public BufferedSource peek() {

        throw new UnsupportedOperationException("Not implemented");

    }

    */



    @Override

    public InputStream inputStream() {

src/main/java/com/nextcloud/android/sso/helper/Retrofit2Helper.java

+11 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import okhttp3.Protocol; 
import okhttp3.Request;

import okhttp3.ResponseBody;

import okio.BufferedSource;

import okio.Timeout;

import retrofit2.Call;

import retrofit2.Callback;

import retrofit2.Response;
@@ -102,6 +103,11 @@ public final class Retrofit2Helper { 
                throw new UnsupportedOperationException("Not implemented");

            }



            @Override

            public Timeout timeout() {

                throw new UnsupportedOperationException("Not implemented");

            }



            private Response<T> convertExceptionToResponse(int statusCode, String errorMessage) {

                ResponseBody body = ResponseBody.create(null, errorMessage);

                return Response.error(
@@ -167,6 +173,11 @@ public final class Retrofit2Helper { 
            public Request request() {

                throw new UnsupportedOperationException("Not implemented");

            }



            @Override

            public Timeout timeout() {

                throw new UnsupportedOperationException("Not implemented");

            }

        };



    }