Skip to content

Commit

Permalink
updated changes to be compatible in android to 31
Browse files Browse the repository at this point in the history
  • Loading branch information
junaidwarsivd committed Feb 14, 2023
1 parent 680f684 commit b06faac
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ subprojects {
ext.androidToolsBuildGradle = '4.0.0'
ext.androidBuildToolsVersion = '29.0.3'
ext.androidMinSdkVersion = 18
ext.androidCompileSdkVersion = 29
ext.androidTargetSdkVersion = 29
ext.androidCompileSdkVersion = 31
ext.androidTargetSdkVersion = 31

ext.androidAnnotationsVersion = '3.0.1'
ext.androidAnnotationsAPIVersion = '3.0.1'
Expand Down
7 changes: 5 additions & 2 deletions opensrp-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ afterEvaluate {
}
configurations.all {
resolutionStrategy.force 'commons-codec:commons-codec:1.10'
exclude group: 'com.evernote', module: 'android-job'
}

dependencies {
Expand All @@ -172,7 +173,9 @@ dependencies {
implementation 'org.codehaus.jackson:jackson-core-asl:1.9.13'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "org.apache.httpcomponents:httpmime:4.5.6"
implementation ("org.apache.httpcomponents:httpmime:4.5.11"){
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
}
implementation group: 'commons-codec', name: 'commons-codec', version: '1.10'
implementation group: 'com.google.guava', name: 'guava', version: '24.1-jre'
implementation group: 'commons-io', name: 'commons-io', version: '2.4'
Expand Down Expand Up @@ -210,7 +213,7 @@ dependencies {
exclude group: 'com.android.support', module: 'recyclerview-v7'
}

implementation('com.evernote:android-job:1.2.6') {
implementation('com.github.devv911:android-job:1.4.5') {
exclude group: 'com.google.android', module: 'android'
}

Expand Down
3 changes: 2 additions & 1 deletion sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down

0 comments on commit b06faac

Please sign in to comment.