diff --git a/app/build.gradle b/app/build.gradle index 4e01539f..3ce9bbca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,12 +64,12 @@ android { localProperties.load(new FileInputStream(rootProject.file("local.properties"))) } - buildConfigField "String", "USER_ID", System.getenv("USER_ID") ?: localProperties['USER_ID'] ?: "" - buildConfigField "String", "INSTANCE_URI", System.getenv("INSTANCE_URI") ?: localProperties['INSTANCE_URI'] ?: "" - buildConfigField "String", "ACCESS_TOKEN", System.getenv("ACCESS_TOKEN") ?: localProperties['ACCESS_TOKEN'] ?: "" - buildConfigField "String", "REFRESH_TOKEN", System.getenv("REFRESH_TOKEN") ?: localProperties['REFRESH_TOKEN'] ?: "" - buildConfigField "String", "CLIENT_ID", System.getenv("CLIENT_ID") ?: localProperties['CLIENT_ID'] ?: "" - buildConfigField "String", "CLIENT_SECRET", System.getenv("CLIENT_SECRET") ?: localProperties['CLIENT_SECRET'] ?: "" + buildConfigField "String", "USER_ID", System.getenv("USER_ID") ?: localProperties['USER_ID'] ?: '""' + buildConfigField "String", "INSTANCE_URI", System.getenv("INSTANCE_URI") ?: localProperties['INSTANCE_URI'] ?: '""' + buildConfigField "String", "ACCESS_TOKEN", System.getenv("ACCESS_TOKEN") ?: localProperties['ACCESS_TOKEN'] ?: '""' + buildConfigField "String", "REFRESH_TOKEN", System.getenv("REFRESH_TOKEN") ?: localProperties['REFRESH_TOKEN'] ?: '""' + buildConfigField "String", "CLIENT_ID", System.getenv("CLIENT_ID") ?: localProperties['CLIENT_ID'] ?: '""' + buildConfigField "String", "CLIENT_SECRET", System.getenv("CLIENT_SECRET") ?: localProperties['CLIENT_SECRET'] ?: '""' } release { minifyEnabled true @@ -90,7 +90,7 @@ android { } buildFeatures { - viewBinding = true + viewBinding true dataBinding = true } @@ -103,10 +103,10 @@ dependencies { /** * AndroidX dependencies: */ - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.core:core-ktx:1.5.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' implementation "androidx.browser:browser:1.3.0" @@ -114,25 +114,25 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' - implementation 'androidx.paging:paging-runtime-ktx:3.0.0' + implementation 'androidx.paging:paging-runtime-ktx:3.0.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1' implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1" implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1" implementation "androidx.annotation:annotation:1.2.0" implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation "androidx.activity:activity-ktx:1.2.3" - implementation 'androidx.fragment:fragment-ktx:1.3.5' + implementation "androidx.activity:activity-ktx:1.3.1" + implementation 'androidx.fragment:fragment-ktx:1.3.6' // Use the most recent version of CameraX - def cameraX_version = '1.0.0' + def cameraX_version = '1.0.1' implementation "androidx.camera:camera-core:${cameraX_version}" implementation "androidx.camera:camera-camera2:${cameraX_version}" // CameraX Lifecycle library implementation "androidx.camera:camera-lifecycle:$cameraX_version" // CameraX View class - implementation 'androidx.camera:camera-view:1.0.0-alpha25' + implementation 'androidx.camera:camera-view:1.0.0-alpha28' def room_version = "2.3.0" implementation "androidx.room:room-runtime:$room_version" @@ -145,14 +145,14 @@ dependencies { */ - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' //Dagger (dependency injection) - implementation 'com.google.dagger:dagger-android:2.37' - implementation 'com.google.dagger:dagger-android-support:2.37' + implementation 'com.google.dagger:dagger-android:2.38.1' + implementation 'com.google.dagger:dagger-android-support:2.38.1' // if you use the support libraries - kapt 'com.google.dagger:dagger-android-processor:2.37' - kapt 'com.google.dagger:dagger-compiler:2.37' + kapt 'com.google.dagger:dagger-android-processor:2.38.1' + kapt 'com.google.dagger:dagger-compiler:2.38.1' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.squareup.retrofit2:retrofit:2.9.0' @@ -179,18 +179,18 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.mikepenz:materialdrawer:8.4.1' + implementation 'com.mikepenz:materialdrawer:8.4.2' // Add for NavController support - implementation 'com.mikepenz:materialdrawer-nav:8.4.0' + implementation 'com.mikepenz:materialdrawer-nav:8.4.2' //iconics - implementation "com.mikepenz:iconics-core:5.2.8" - implementation 'com.mikepenz:materialdrawer-iconics:8.4.1' - implementation "com.mikepenz:iconics-views:5.0.3" + implementation "com.mikepenz:iconics-core:5.3.0" + implementation 'com.mikepenz:materialdrawer-iconics:8.4.2' + implementation "com.mikepenz:iconics-views:5.3.0" implementation 'com.mikepenz:google-material-typeface:3.0.1.4.original-kotlin@aar' - implementation 'com.karumi:dexter:6.2.2' + implementation 'com.karumi:dexter:6.2.3' implementation 'com.github.ligi:tracedroid:4.1' @@ -202,7 +202,7 @@ dependencies { // debugImplementation required vs testImplementation: https://issuetracker.google.com/issues/128612536 //noinspection FragmentGradleConfiguration - stagingImplementation("androidx.fragment:fragment-testing:1.3.5") { + stagingImplementation('androidx.fragment:fragment-testing:1.3.6') { exclude group:'androidx.test', module:'monitor' } @@ -215,13 +215,13 @@ dependencies { androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test:rules:1.3.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test:rules:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0' diff --git a/build.gradle b/build.gradle index 1f7bac9a..e8de6ddf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.20' + ext.kotlin_version = '1.5.30' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4cbfee3..205180f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd