Skip to content

Commit

Permalink
Remove multiDex in demo app, update minSdkVersion, update libraries v…
Browse files Browse the repository at this point in the history
…erisions
  • Loading branch information
regdos committed Mar 6, 2024
1 parent 3082e48 commit aa4943c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
10 changes: 4 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ android {
versionCode project.versionCode
versionName project.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
buildTypes {
release {
Expand All @@ -30,7 +29,6 @@ android {
dependencies {
implementation "androidx.fragment:fragment:$fragmentVersion"

implementation "androidx.multidex:multidex:$project.multidexVersion"
implementation "androidx.appcompat:appcompat:$project.appCompatVersion"
implementation "androidx.constraintlayout:constraintlayout:$project.constraintLayoutVersion"
implementation "com.google.android.material:material:$project.materialVersion"
Expand All @@ -45,10 +43,10 @@ dependencies {
kapt "com.github.bumptech.glide:compiler:$project.glideVersion"

// Dagger
kapt "com.google.dagger:dagger-compiler:2.42"
kapt "com.google.dagger:dagger-android-processor:2.42"
implementation "com.google.dagger:dagger:2.42"
implementation "com.google.dagger:dagger-android-support:2.42"
kapt "com.google.dagger:dagger-compiler:2.50"
kapt "com.google.dagger:dagger-android-processor:2.50"
implementation "com.google.dagger:dagger:2.50"
implementation "com.google.dagger:dagger-android-support:2.50"

// RxJava
implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.payu.android.front.sdk.demo

import androidx.multidex.MultiDexApplication
import android.app.Application
import com.payu.android.front.sdk.demo.di.AppComponent
import com.payu.android.front.sdk.demo.di.DaggerAppComponent
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasAndroidInjector
import javax.inject.Inject

class DemoApplication: MultiDexApplication(), HasAndroidInjector {
class DemoApplication: Application(), HasAndroidInjector {
@Inject
lateinit var androidInjector: DispatchingAndroidInjector<Any>

Expand Down
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.7.22'

repositories {
mavenCentral()
Expand All @@ -12,7 +12,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.33.1"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.33.12"
}
}

Expand All @@ -35,16 +35,15 @@ tasks.register("version") {

project.ext {
//libraries
multidexVersion = "2.0.1"
guavaVersion = "32.1.3-android"
guavaVersion = "33.0.0-android"
appCompatVersion = "1.5.1"
recyclerViewVersion = "1.2.1"
annotationVersion = "1.1.0"
materialVersion = "1.1.0"
espressoVersion = "3.1.0"
constraintLayoutVersion = "2.1.4"
robolectricVersion = "4.9"
glideVersion = "4.13.2"
glideVersion = "4.16.0"
architectureComponentsCoreVersion = "2.0.0"
lifecycleComponentVersion = "2.4.1"
gsonVersion = "2.8.6"
Expand All @@ -71,7 +70,7 @@ project.ext {
//android configuration
compileSdkVersion = 33
targetSdkVersion = 33
minSdkVersion = 19
minSdkVersion = 21
versionCode = 6
versionName = "1.0.26"
groupId = "com.payu.android.front.sdk"
Expand Down

0 comments on commit aa4943c

Please sign in to comment.