From a968d9163e7e4a095c9d29976d22739c06e6ff6b Mon Sep 17 00:00:00 2001 From: Eduardo-Nunes Date: Sun, 10 Jul 2022 15:13:52 -0300 Subject: [PATCH 1/2] update dependencies and fix gradle sync --- app/build.gradle | 65 ++++++++++-------------- app/src/main/AndroidManifest.xml | 3 +- build.gradle | 47 ++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 51 insertions(+), 66 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a7fbdc0e9..282582443 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,17 +1,14 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 + compileSdkVersion 33 + defaultConfig { applicationId "com.picpay.desafio.android" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -19,9 +16,8 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildTypes { - debug {} + buildTypes { release { minifyEnabled true shrinkResources true @@ -30,13 +26,24 @@ android { } compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } + + packagingOptions { + resources { + pickFirsts += ['META-INF/AL2.0', 'META-INF/LGPL2.1'] + } + } + + buildFeatures { + viewBinding true + } + namespace 'com.picpay.desafio.android' } dependencies { @@ -45,48 +52,30 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.core:core-ktx:$core_ktx_version" - implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - implementation "com.google.android.material:material:$material_version" + implementation "androidx.core:core-splashscreen:$splash_version" + implementation "androidx.recyclerview:recyclerview:$recycler_view_version" + implementation "io.coil-kt:coil:$coil_version" - implementation "org.koin:koin-core:$koin_version" - implementation "org.koin:koin-android:$koin_version" - implementation "org.koin:koin-androidx-viewmodel:$koin_version" - - implementation "com.google.dagger:dagger:$dagger_version" - kapt "com.google.dagger:dagger-compiler:$dagger_version" - - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" - - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" - - implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" - implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version" - - implementation 'com.google.code.gson:gson:2.8.6' implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version" implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" - implementation "com.squareup.okhttp3:okhttp:$okhttp_version" + implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version" implementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" - implementation "com.squareup.picasso:picasso:$picasso_version" - implementation "de.hdodenhof:circleimageview:$circleimageview_version" + implementation "io.insert-koin:koin-android:$koin_version" + testImplementation "io.insert-koin:koin-test:$koin_version" + testImplementation "io.insert-koin:koin-test-junit4:$koin_version" testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_kotlin_version" testImplementation "androidx.arch.core:core-testing:$core_testing_version" - implementation "org.koin:koin-test:$koin_version" - androidTestImplementation "androidx.test:runner:$test_runner_version" androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" - androidTestImplementation "androidx.test:core-ktx:$core_ktx_test_version" + + implementation "com.facebook.stetho:stetho:$stetho_version" + implementation "com.facebook.stetho:stetho-okhttp3:$stetho_version" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bdf2ce38..02787ccad 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/build.gradle b/build.gradle index 7d1b94f34..f607b45b9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,42 +2,40 @@ buildscript { ext { - kotlin_version = '1.3.61' + gradle_version = '7.2.1' - appcompat_version = '1.1.0' - core_ktx_version = '1.2.0' - core_testing_version = '2.1.0' - constraintlayout_version = '1.1.3' - material_version = "1.1.0" - moshi_version = '1.8.0' - retrofit_version = '2.7.1' - okhttp_version = '4.3.1' - picasso_version = '2.71828' - circleimageview_version = '3.0.0' + kotlin_version = '1.7.10' + + core_ktx_version = '1.8.0' + appcompat_version = '1.4.2' + constraintlayout_version = '2.1.4' + material_version = '1.7.0-alpha02' + splash_version = '1.0.0-rc0' + recycler_view_version = '1.2.1' + coil_version = '2.1.0' + + retrofit_version = '2.9.0' + okhttp_version = '4.10.0' + + koin_version = '3.2.0' junit_version = '4.12' mockito_version = '2.27.0' mockito_kotlin_version = '2.1.0' - + core_testing_version = '2.1.0' test_runner_version = '1.1.1' - espresso_version = '3.1.1' - - koin_version = "2.0.1" - dagger_version = "2.23.2" - lifecycle_version = "2.2.0" - coroutines_version = "1.3.3" - rxjava_version = "2.2.17" - rxandroid_version = "2.1.1" - core_ktx_test_version = "1.2.0" + espresso_version = '3.4.0' + + stetho_version = '1.6.0' } repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath "com.android.tools.build:gradle:$gradle_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -47,8 +45,7 @@ buildscript { allprojects { repositories { google() - jcenter() - + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 31680f1d6..cdaa08f8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip From df634a778e0bc0a47a40e3e62c971c14afcdf216 Mon Sep 17 00:00:00 2001 From: Eduardo-Nunes Date: Sun, 10 Jul 2022 15:15:02 -0300 Subject: [PATCH 2/2] add .idea to git ignore --- .gitignore | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2b75303ac..ef3debe75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,8 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild +/.idea