Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial config #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,14 @@
/build
/captures
.externalNativeBuild
*.idea

# IntelliJ
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/caches
/.idea/
37 changes: 16 additions & 21 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-parcelize'
}

android {
compileSdkVersion 29
compileSdkVersion 32
defaultConfig {
applicationId "com.picpay.desafio.android"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 32
versionCode 1
versionName "1.0"
}

vectorDrawables.useSupportLibrary = true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
viewBinding.enabled = true
testOptions {
unitTests.returnDefaultValues = true
}

buildTypes {
debug {}

Expand All @@ -30,8 +31,8 @@ android {
}

compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
Expand All @@ -45,19 +46,16 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation "androidx.core:core-ktx:$core_ktx_version"
implementation "androidx.fragment:fragment-ktx:$fragment_ktx_version"

implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"

implementation "com.google.android.material:material:$material_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"
Expand All @@ -66,9 +64,6 @@ dependencies {
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"
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<activity android:name=".MainActivity">
tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">

<activity android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>

</manifest>
2 changes: 1 addition & 1 deletion app/src/main/java/com/picpay/desafio/android/User.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.picpay.desafio.android

import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize

@Parcelize
data class User(
Expand Down
38 changes: 19 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,44 @@

buildscript {
ext {
kotlin_version = '1.3.61'
kotlin_version = '1.6.10'

appcompat_version = '1.1.0'
core_ktx_version = '1.2.0'
appcompat_version = '1.4.1'
core_ktx_version = '1.7.0'
fragment_ktx_version = "1.4.1"
core_testing_version = '2.1.0'
constraintlayout_version = '1.1.3'
material_version = "1.1.0"
constraintlayout_version = '2.1.3'
material_version = "1.5.0"
moshi_version = '1.8.0'
retrofit_version = '2.7.1'
okhttp_version = '4.3.1'
retrofit_version = '2.9.0'
okhttp_version = '4.9.2'
picasso_version = '2.71828'
circleimageview_version = '3.0.0'

junit_version = '4.12'
mockito_version = '2.27.0'
junit_version = '4.13.2'
mockito_version = '4.0.0'
mockito_kotlin_version = '2.1.0'

test_runner_version = '1.1.1'
espresso_version = '3.1.1'
test_runner_version = '1.4.0'
espresso_version = '3.4.0'

koin_version = "2.0.1"
dagger_version = "2.23.2"
lifecycle_version = "2.2.0"
coroutines_version = "1.3.3"
dagger_version = "2.28.3"
lifecycle_version = "2.4.1"
coroutines_version = "1.5.2"
rxjava_version = "2.2.17"
rxandroid_version = "2.1.1"
core_ktx_test_version = "1.2.0"
core_ktx_test_version = "1.4.0"
}

repositories {
google()
jcenter()

}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -48,7 +49,6 @@ allprojects {
repositories {
google()
jcenter()

}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-all.zip