Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/agent_v2.0' into agent_v2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
softsolutionzonein committed Jan 10, 2024
2 parents 8310ef9 + fa34ffd commit f5dc165
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions aepssdkssz/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apply plugin: 'com.android.library'

android {
namespace 'com.aepssdkssz'
compileSdk 33
compileSdk 34
defaultConfig {
//applicationId "com.aepssdkssz"
minSdk 21
targetSdk 33
targetSdk 34
//versionCode 1
// versionName "1.0"

Expand All @@ -29,11 +29,11 @@ android {
dependencies {

implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.10.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

//Retrofit and GSON
Expand All @@ -42,8 +42,8 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2'

implementation 'com.squareup.picasso:picasso:2.71828'
implementation('com.journeyapps:zxing-android-embedded:4.2.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.0'
implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.1'
implementation 'com.github.chivorns:smartmaterialspinner:1.5.0'
implementation 'com.karumi:dexter:6.2.3'
}
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ android {
dependencies {

implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
implementation 'androidx.navigation:navigation-fragment:2.5.1'
implementation 'androidx.navigation:navigation-ui:2.5.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
implementation 'androidx.navigation:navigation-fragment:2.7.4'
implementation 'androidx.navigation:navigation-ui:2.7.4'
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
Expand All @@ -73,7 +73,7 @@ dependencies {
implementation 'com.android.volley:volley:1.2.1'
implementation 'com.nineoldandroids:library:2.4.0'
implementation "com.github.bumptech.glide:glide:4.15.0"
annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
annotationProcessor "com.github.bumptech.glide:compiler:4.15.0"

implementation "com.github.firdausmaulan:GlideSlider:1.5.1"
implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
Expand All @@ -97,8 +97,8 @@ dependencies {
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.67'
implementation 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'

implementation('com.journeyapps:zxing-android-embedded:4.2.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.0'
implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.1'

//Images
implementation 'com.github.dhaval2404:imagepicker:2.1'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
dependencies {
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath 'com.google.firebase:perf-plugin:1.4.2'
}
}
Expand Down

0 comments on commit f5dc165

Please sign in to comment.