Skip to content

Updates: compile sdk version and target sdk version to 31 for Android 12 migration #110

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.

Sign up for GitHub

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

Merged
ParaskP7 merged 3 commits into from
Oct 13, 2022
Merged

Updates: compile sdk version and target sdk version to 31 for Android 12 migration #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d63ec
Updates: compile sdk version and target sdk version to 31
AjeshRPai Sep 28, 2022
d7f1ca8
Updates: test classes for compatibility with Android 12
AjeshRPai Sep 30, 2022
13b4f06
Updates: getColumn index call with getColumnIndexOrThrow
AjeshRPai Oct 3, 2022
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
12 changes: 6 additions & 6 deletions WordPressUtils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation "org.robolectric:robolectric:4.4"
testImplementation 'androidx.test:core:1.0.0'
testImplementation 'androidx.test:core:1.4.0'

lintChecks 'org.wordpress:lint:1.1.0'
androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'androidx.test:rules:1.1.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

}

android {
useLibrary 'org.apache.http.legacy'

compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
2 changes: 1 addition & 1 deletion WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static int getImageOrientation(Context ctx, String filePath) {
.query(curStream, new String[]{MediaStore.Images.Media.ORIENTATION}, null, null, null);
if (cur != null) {
if (cur.moveToFirst()) {
orientation = cur.getInt(cur.getColumnIndex(MediaStore.Images.Media.ORIENTATION));
orientation = cur.getInt(cur.getColumnIndexOrThrow(MediaStore.Images.Media.ORIENTATION));
}
cur.close();
}
Expand Down