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

Unverified Commit a5f0572c authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6275 from PatrykMis/patch-1 

Bump compileSdkVersion and dependencies
parents 58281359 5cc022a9

build.gradle

+8 −7
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile 
buildscript {

    ext {

        buildConfig = [

                'compileSdk': 31,

                'compileSdk': 33,

                'targetSdk': 31,

                'minSdk': 21,

                'buildTools': '32.0.0',
@@ -16,7 +16,7 @@ buildscript { 
                'kotlin': '1.7.10',

                'kotlinCoroutines': '1.6.4',

                'jetbrainsAnnotations': '23.0.0',

                'androidxAppCompat': '1.4.2',

                'androidxAppCompat': '1.5.0',

                'androidxActivity': '1.5.1',

                'androidxRecyclerView': '1.2.1',

                'androidxLifecycle': '2.5.1',
@@ -25,7 +25,7 @@ buildscript { 
                'androidxNavigation': '2.5.1',

                'androidxConstraintLayout': '2.1.4',

                'androidxWorkManager': '2.7.1',

                'androidxFragment': '1.5.1',

                'androidxFragment': '1.5.2',

                'androidxLocalBroadcastManager': '1.1.0',

                'androidxCore': '1.8.0',

                'androidxCardView': '1.0.0',
@@ -44,14 +44,15 @@ buildscript { 
                'commonsIo': '2.6',

                'mime4j': '0.8.6',

                'okhttp': '4.10.0',

                'minidns': '1.0.3',

                'minidns': '1.0.4',

                'glide': '4.13.2',

                'jsoup': '1.15.2',

                'jsoup': '1.15.3',

                'httpClient': '4.5.13',



                'androidxTestRunner': '1.4.0',

                'junit': '4.13.2',

                'robolectric': '4.8.1',

                'mockito': '4.6.1',

                'robolectric': '4.8.2',

                'mockito': '4.7.0',

                'mockitoKotlin': '4.0.0',

                'truth': '1.1.3',

                'turbine': '0.9.0',

gradle/wrapper/gradle-wrapper.properties

+2 −1
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219

distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

mail/protocols/webdav/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ dependencies { 
    api project(":mail:common")



    implementation "commons-io:commons-io:${versions.commonsIo}"

    compileOnly "org.apache.httpcomponents:httpclient:4.5.5"

    compileOnly "org.apache.httpcomponents:httpclient:${versions.httpClient}"



    testImplementation project(":mail:testing")

    testImplementation "junit:junit:${versions.junit}"

    testImplementation "com.google.truth:truth:${versions.truth}"

    testImplementation "org.mockito:mockito-inline:${versions.mockito}"

    testImplementation "org.apache.httpcomponents:httpclient:4.5.5"

    testImplementation "org.apache.httpcomponents:httpclient:${versions.httpClient}"

}