From e68c22d0f3b1694db9f7638fda6631df22c75928 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Wed, 20 Jan 2021 11:01:00 +0100 Subject: [PATCH] Reformat code [ci skip] --- buildsystem/dependencies.gradle | 215 ++++++++++++++++---------------- 1 file changed, 108 insertions(+), 107 deletions(-) diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 2d941c03..8a8ec546 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -1,154 +1,155 @@ allprojects { - repositories { - jcenter() - } + repositories { + jcenter() + } } ext { - androidBuildToolsVersion = "29.0.2" - androidMinSdkVersion = 23 - androidTargetSdkVersion = 29 - androidCompileSdkVersion = 29 + androidBuildToolsVersion = "29.0.2" + androidMinSdkVersion = 23 + androidTargetSdkVersion = 29 + androidCompileSdkVersion = 29 - // android and java libs - androidVersion = '4.1.1.4' - multidexVersion = '2.0.1' - javaxAnnotationVersion = '1.0' + // android and java libs + androidVersion = '4.1.1.4' + multidexVersion = '2.0.1' + javaxAnnotationVersion = '1.0' - // support lib - androidSupportAnnotationsVersion = '1.1.0' - androidSupportAppcompatVersion = '1.2.0' // check https://stackoverflow.com/questions/41025200/android-view-inflateexception-error-inflating-class-android-webkit-webview/57968071#57968071 !!!!!! - androidSupportDesignVersion = '1.2.1' + // support lib + androidSupportAnnotationsVersion = '1.1.0' + androidSupportAppcompatVersion = '1.2.0' + // check https://stackoverflow.com/questions/41025200/android-view-inflateexception-error-inflating-class-android-webkit-webview/57968071#57968071 !!!!!! + androidSupportDesignVersion = '1.2.1' - // app frameworks and utilities + // app frameworks and utilities - rxJavaVersion = '2.2.20' - rxAndroidVersion = '2.1.1' - rxBindingVersion = '2.2.0' + rxJavaVersion = '2.2.20' + rxAndroidVersion = '2.1.1' + rxBindingVersion = '2.2.0' - daggerVersion = '2.30.1' + daggerVersion = '2.30.1' - gsonVersion = '2.8.6' + gsonVersion = '2.8.6' - okHttpVersion = '4.9.0' - okHttpDigestVersion = '2.5' + okHttpVersion = '4.9.0' + okHttpDigestVersion = '2.5' - velocityVersion = '1.7' + velocityVersion = '1.7' - timberVersion = '4.7.1' + timberVersion = '4.7.1' - zxcvbnVersion = '1.3.1' + zxcvbnVersion = '1.3.1' - scaleImageViewVersion = '3.10.0' + scaleImageViewVersion = '3.10.0' - lruFileCacheVersion = '1.0' + lruFileCacheVersion = '1.0' - // KEEP IN SYNC WITH GENERATOR VERSION IN root build.gradle - greenDaoVersion = '3.3.0' + // KEEP IN SYNC WITH GENERATOR VERSION IN root build.gradle + greenDaoVersion = '3.3.0' - // cloud provider libs + // cloud provider libs // do not update to 1.4.0 until dropping minsdk 4.x - cryptolibVersion = '1.3.0' + cryptolibVersion = '1.3.0' - dropboxVersion = '3.1.5' + dropboxVersion = '3.1.5' - googleApiServicesVersion = 'v3-rev197-1.25.0' - googlePlayServicesVersion = '19.0.0' - googleClientVersion = '1.31.1' + googleApiServicesVersion = 'v3-rev197-1.25.0' + googlePlayServicesVersion = '19.0.0' + googleClientVersion = '1.31.1' - msgraphVersion = '2.5.0' - msaAuthVersion = '0.10.0' + msgraphVersion = '2.5.0' + msaAuthVersion = '0.10.0' - commonsCodecVersion = '1.15' + commonsCodecVersion = '1.15' recyclerViewFastScrollVersion = '2.0.1' - // testing dependencies + // testing dependencies - jUnitVersion = '5.7.0' + jUnitVersion = '5.7.0' jUnit4Version = '4.13.1' - assertJVersion = '1.7.1' - mockitoVersion = '3.6.28' + assertJVersion = '1.7.1' + mockitoVersion = '3.6.28' mockitoInlineVersion = '3.6.28' - hamcrestVersion = '1.3' - dexmakerVersion = '1.0' - espressoVersion = '3.3.0' - testingSupportLibVersion = '0.1' - runnerVersion = '1.3.0' - rulesVersion = '1.3.0' - contributionVersion = '3.3.0' - uiautomatorVersion = '2.2.0' + hamcrestVersion = '1.3' + dexmakerVersion = '1.0' + espressoVersion = '3.3.0' + testingSupportLibVersion = '0.1' + runnerVersion = '1.3.0' + rulesVersion = '1.3.0' + contributionVersion = '3.3.0' + uiautomatorVersion = '2.2.0' - androidxCoreVersion = '1.3.2' - androidxFragmentVersion = '1.2.5' - androidxViewpagerVersion = '1.0.0' - androidxSwiperefreshVersion = '1.1.0' - androidxPreferenceVersion = '1.0.0' // 1.1.0 and 1.1.2 does have a bug with the text size - androidxRecyclerViewVersion = '1.1.0' - androidxDocumentfileVersion = '1.0.1' + androidxCoreVersion = '1.3.2' + androidxFragmentVersion = '1.2.5' + androidxViewpagerVersion = '1.0.0' + androidxSwiperefreshVersion = '1.1.0' + androidxPreferenceVersion = '1.0.0' // 1.1.0 and 1.1.2 does have a bug with the text size + androidxRecyclerViewVersion = '1.1.0' + androidxDocumentfileVersion = '1.0.1' androidxBiometricVersion = '1.0.1' androidxTestCoreVersion = '1.3.0' - jsonWebTokenApiVersion = '0.11.2' + jsonWebTokenApiVersion = '0.11.2' - dependencies = [ - android : "com.google.android:android:${androidVersion}", - androidAnnotations : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}", - appcompat : "androidx.appcompat:appcompat:${androidSupportAppcompatVersion}", - androidxBiometric : "androidx.biometric:biometric:${androidxBiometricVersion}", + dependencies = [ + android : "com.google.android:android:${androidVersion}", + androidAnnotations : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}", + appcompat : "androidx.appcompat:appcompat:${androidSupportAppcompatVersion}", + androidxBiometric : "androidx.biometric:biometric:${androidxBiometricVersion}", androidxCore : "androidx.core:core-ktx:${androidxCoreVersion}", - androidxFragment : "androidx.fragment:fragment-ktx:${androidxFragmentVersion}", - androidxViewpager : "androidx.viewpager:viewpager:${androidxViewpagerVersion}", - androidxSwiperefresh : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}", - androidxPreference : "androidx.preference:preference:${androidxPreferenceVersion}", - documentFile : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}", - recyclerView : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}", + androidxFragment : "androidx.fragment:fragment-ktx:${androidxFragmentVersion}", + androidxViewpager : "androidx.viewpager:viewpager:${androidxViewpagerVersion}", + androidxSwiperefresh : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}", + androidxPreference : "androidx.preference:preference:${androidxPreferenceVersion}", + documentFile : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}", + recyclerView : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}", androidxTestCore : "androidx.test:core:${androidxTestCoreVersion}", - commonsCodec : "commons-codec:commons-codec:${commonsCodecVersion}", - cryptolib : "org.cryptomator:cryptolib:${cryptolibVersion}", - dagger : "com.google.dagger:dagger:${daggerVersion}", - daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}", - design : "com.google.android.material:material:${androidSupportDesignVersion}", - dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}", - espresso : "androidx.test.espresso:espresso-core:${espressoVersion}", - googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}", - googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}", - googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}", - greenDao : "org.greenrobot:greendao:${greenDaoVersion}", - gson : "com.google.code.gson:gson:${gsonVersion}", - hamcrest : "org.hamcrest:hamcrest-all:${hamcrestVersion}", - javaxAnnotation : "javax.annotation:jsr250-api:${javaxAnnotationVersion}", - junit : "org.junit.jupiter:junit-jupiter:${jUnitVersion}", + commonsCodec : "commons-codec:commons-codec:${commonsCodecVersion}", + cryptolib : "org.cryptomator:cryptolib:${cryptolibVersion}", + dagger : "com.google.dagger:dagger:${daggerVersion}", + daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}", + design : "com.google.android.material:material:${androidSupportDesignVersion}", + dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}", + espresso : "androidx.test.espresso:espresso-core:${espressoVersion}", + googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}", + googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}", + googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}", + greenDao : "org.greenrobot:greendao:${greenDaoVersion}", + gson : "com.google.code.gson:gson:${gsonVersion}", + hamcrest : "org.hamcrest:hamcrest-all:${hamcrestVersion}", + javaxAnnotation : "javax.annotation:jsr250-api:${javaxAnnotationVersion}", + junit : "org.junit.jupiter:junit-jupiter:${jUnitVersion}", junitApi : "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}", junitEngine : "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}", junitParams : "org.junit.jupiter:junit-jupiter-params:${jUnitVersion}", junit4 : "org.junit.jupiter:junit-jupiter:${jUnit4Version}", junit4Engine : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}", - msgraph : "com.microsoft.graph:microsoft-graph:${msgraphVersion}", - msaAuth : "com.microsoft.graph:msa-auth-for-android-adapter:${msaAuthVersion}", - mockito : "org.mockito:mockito-core:${mockitoVersion}", + msgraph : "com.microsoft.graph:microsoft-graph:${msgraphVersion}", + msaAuth : "com.microsoft.graph:msa-auth-for-android-adapter:${msaAuthVersion}", + mockito : "org.mockito:mockito-core:${mockitoVersion}", mockitoInline : "org.mockito:mockito-inline:${mockitoInlineVersion}", - multidex : "androidx.multidex:multidex:${multidexVersion}", - okHttp : "com.squareup.okhttp3:okhttp:${okHttpVersion}", - okHttpDigest : "com.burgstaller:okhttp-digest:${okHttpDigestVersion}", + multidex : "androidx.multidex:multidex:${multidexVersion}", + okHttp : "com.squareup.okhttp3:okhttp:${okHttpVersion}", + okHttpDigest : "com.burgstaller:okhttp-digest:${okHttpDigestVersion}", recyclerViewFastScroll: "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}", rxJava : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}", - rxAndroid : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}", - rxBinding : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}", - testingSupportLib : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}", - timber : "com.jakewharton.timber:timber:${timberVersion}", - velocity : "org.apache.velocity:velocity:${velocityVersion}", - runner : "androidx.test:runner:${runnerVersion}", - rules : "androidx.test:rules:${rulesVersion}", - contribution : "androidx.test.espresso:espresso-contrib:${contributionVersion}", - uiAutomator : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}", - zxcvbn : "com.nulab-inc:zxcvbn:${zxcvbnVersion}", - scaleImageView : "com.davemorrissey.labs:subsampling-scale-image-view:${scaleImageViewVersion}", - lruFileCache : "com.tomclaw.cache:cache:${lruFileCacheVersion}", - jsonWebTokenApi : "io.jsonwebtoken:jjwt-api:${jsonWebTokenApiVersion}", - jsonWebTokenImpl : "io.jsonwebtoken:jjwt-impl:${jsonWebTokenApiVersion}", - jsonWebTokenJson : "io.jsonwebtoken:jjwt-orgjson:${jsonWebTokenApiVersion}" - ] + rxAndroid : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}", + rxBinding : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}", + testingSupportLib : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}", + timber : "com.jakewharton.timber:timber:${timberVersion}", + velocity : "org.apache.velocity:velocity:${velocityVersion}", + runner : "androidx.test:runner:${runnerVersion}", + rules : "androidx.test:rules:${rulesVersion}", + contribution : "androidx.test.espresso:espresso-contrib:${contributionVersion}", + uiAutomator : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}", + zxcvbn : "com.nulab-inc:zxcvbn:${zxcvbnVersion}", + scaleImageView : "com.davemorrissey.labs:subsampling-scale-image-view:${scaleImageViewVersion}", + lruFileCache : "com.tomclaw.cache:cache:${lruFileCacheVersion}", + jsonWebTokenApi : "io.jsonwebtoken:jjwt-api:${jsonWebTokenApiVersion}", + jsonWebTokenImpl : "io.jsonwebtoken:jjwt-impl:${jsonWebTokenApiVersion}", + jsonWebTokenJson : "io.jsonwebtoken:jjwt-orgjson:${jsonWebTokenApiVersion}" + ] }