Skip to content

Commit 948a455

Browse files
authored
chore(#324): upgrading to android 13 (#325)
1 parent 2061adc commit 948a455

File tree

6 files changed

+15
-2
lines changed

6 files changed

+15
-2
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def getVersionName = {
9595
}
9696

9797
android {
98-
compileSdkVersion 31
98+
compileSdkVersion 33
9999
buildToolsVersion '30.0.3'
100100
packagingOptions {
101101
exclude 'META-INF/LICENSE'
@@ -104,7 +104,7 @@ android {
104104

105105
defaultConfig {
106106
//noinspection OldTargetApi
107-
targetSdkVersion 31
107+
targetSdkVersion 33
108108
minSdkVersion 21 // Android 5.0
109109
versionCode getVersionCode()
110110
versionName getVersionName()

src/main/java/org/medicmobile/webapp/mobile/RequestStoragePermissionActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ public class RequestStoragePermissionActivity extends FragmentActivity {
7474
public void onCreate(Bundle savedInstanceState) {
7575
super.onCreate(savedInstanceState);
7676

77+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
78+
trace(this, "RequestStoragePermissionActivity :: READ_EXTERNAL_STORAGE permission is ignored in Android 13+.");
79+
setResult(RESULT_OK, createResponseIntent());
80+
finish();
81+
return;
82+
}
83+
7784
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
7885
setContentView(R.layout.request_storage_permission);
7986

src/test/java/org/medicmobile/webapp/mobile/SmsSenderTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.stream.IntStream;
4747

4848
@RunWith(RobolectricTestRunner.class)
49+
@Config(sdk = 31) // ToDo: Remove when upgrading robolectric
4950
public class SmsSenderTest {
5051
@Rule
5152
public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);

src/test/java/org/medicmobile/webapp/mobile/adapters/FilterableListAdapterTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.runner.RunWith;
1010
import org.mockito.Mockito;
1111
import org.robolectric.RobolectricTestRunner;
12+
import org.robolectric.annotation.Config;
1213

1314
import java.util.ArrayList;
1415
import java.util.Collections;
@@ -17,6 +18,7 @@
1718
import java.util.stream.Stream;
1819

1920
@RunWith(RobolectricTestRunner.class)
21+
@Config(sdk = 31) // ToDo: Remove when upgrading robolectric
2022
public class FilterableListAdapterTest {
2123
private static final List<Map<String, ?>> SERVER_DATA = List.of(
2224
Map.of("name", "first server name", "url", "https://my.first.server")

src/test/java/org/medicmobile/webapp/mobile/util/AsyncExecutorTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import org.mockito.junit.MockitoRule;
2121
import org.mockito.quality.Strictness;
2222
import org.robolectric.RobolectricTestRunner;
23+
import org.robolectric.annotation.Config;
2324

2425
import java.util.concurrent.Callable;
2526
import java.util.concurrent.ExecutionException;
2627
import java.util.concurrent.Future;
2728
import java.util.function.Consumer;
2829

2930
@RunWith(RobolectricTestRunner.class)
31+
@Config(sdk = 31) // ToDo: Remove when upgrading robolectric
3032
public class AsyncExecutorTest {
3133
@Rule
3234
public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);

src/test/java/org/medicmobile/webapp/mobile/util/VibratorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.robolectric.annotation.Config;
2222

2323
@RunWith(RobolectricTestRunner.class)
24+
@Config(sdk = 31) // ToDo: Remove when upgrading robolectric
2425
public class VibratorTest {
2526
@Rule
2627
public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);

0 commit comments

Comments
 (0)