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

dependency upgrade #55

Open
wants to merge 1 commit 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
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ android {

dependencies {
//implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.multidex:multidex:2.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation ("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"){
force true
}
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// RecyclerView and CardView
implementation 'androidx.cardview:cardview:1.0.0'
Expand All @@ -48,7 +48,7 @@ dependencies {
implementation "io.reactivex:rxjava:$rxJavaVersion"

// Lifecycle
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

//Square dependencies
implementation("com.squareup.retrofit2:retrofit:$retrofitVersionLatest") {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".ui.HomeActivity">
<activity
android:name=".ui.HomeActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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.3.31'
ext.kotlin_version = '1.6.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -18,20 +18,21 @@ buildscript {
ext {
// Sdk and tools
minSdkVersion = 15
targetSdkVersion = 28
compileSdkVersion = 28
targetSdkVersion = 31
compileSdkVersion = 31
buildToolsVersion = '28.0.3'

// App dependencies
supportLibraryVersion = '27.1.1'
espressoVersion = '2.2.2'
retrofitVersionLatest = '2.1.0'
okHttp3Version = '3.5.0'
retrofitVersionLatest = '2.2.0'
okHttp3Version = '3.6.0'
preference = '1.1.0'
rxJavaVersion = '1.1.4'
rxAndroidVersion = '1.1.0'

okHttp3Version = "3.12.1"
fineractClientVersion = '2.0.3'
preference = '1.2.0'
}

allprojects {
Expand Down
16 changes: 8 additions & 8 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 29
compileSdkVersion 32
buildToolsVersion "29.0.3"

defaultConfig {
minSdkVersion 15
targetSdkVersion 29
targetSdkVersion 32
versionCode 1
versionName "1.0"

Expand All @@ -27,10 +27,10 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'


//testing dependency
Expand All @@ -40,7 +40,7 @@ dependencies {
force true
}

implementation 'io.reactivex:rxjava:1.1.4'
implementation 'io.reactivex:rxjava:1.2.0'

//Square dependencies
implementation("com.squareup.retrofit2:retrofit:$retrofitVersionLatest") {
Expand All @@ -54,7 +54,7 @@ dependencies {
implementation "com.squareup.okhttp3:logging-interceptor:$okHttp3Version"

//Shared Preferences
implementation "androidx.preference:preference:$preference"
implementation "androidx.preference:preference-ktx:$preference"

implementation ("com.github.openMF:fineract-client:$fineractClientVersion")

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-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip