Skip to content

chore: fix to support android-12+ #400

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
merged 7 commits into from
Apr 1, 2022
Merged

chore: fix to support android-12+ #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
769a220
fix to support android-12+
jaeopt Jan 18, 2022
8237e68
update androidx test dependency for android 12
jaeopt Feb 2, 2022
56855b6
add PendingIntent.FLAG_IMMUTABLE
jaeopt Feb 2, 2022
8db52a9
fix FLAG_IMMUTABLE
jaeopt Feb 2, 2022
ee71a3d
fix conflicts
jaeopt Mar 28, 2022
a417cc4
Merge branch 'master' into jae/sdk31
jaeopt Mar 29, 2022
8907100
Merge branch 'master' into jae/sdk31
jaeopt Apr 1, 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
11 changes: 7 additions & 4 deletions android-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@ dependencies {
testImplementation "org.powermock:powermock-mockito-release-full:$powermock_ver"
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"

androidTestImplementation "androidx.test.ext:junit:$androidx_test"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
Expand Down
14 changes: 8 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,23 @@ ext {
compile_sdk_version = 32
build_tools_version = "30.0.3"
min_sdk_version = 14
target_sdk_version = 29
target_sdk_version = 32
java_core_ver = "3.10.2"
android_logger_ver = "1.3.6"
jacksonversion= "2.11.2"
annotations_ver = "1.0.0"
annotations_ver = "1.2.0"
junit_ver = "4.12"
mockito_ver = "1.10.19"
powermock_ver = "1.6.4"
support_test_runner_ver = "0.5"
dexmaker_ver = "1.4"
espresso_ver = "3.1.0"
gson_ver = "2.8.6"
gson_ver = "2.8.9"
group_id = "com.optimizely.ab"
androidx_test = "1.1.1"
work_runtime = "2.5.0"
work_runtime = "2.7.1"
androidx_test_junit = "1.1.3"
androidx_test_core = "1.4.0"
androidx_test_rules = "1.4.0"
espresso_ver = "3.4.0"
}

task clean(type: Delete) {
Expand Down
9 changes: 5 additions & 4 deletions datafile-handler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ dependencies {
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"

androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
Expand Down
10 changes: 6 additions & 4 deletions event-handler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ dependencies {
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"

androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
Expand Down
10 changes: 6 additions & 4 deletions shared/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ dependencies {
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"

androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
Expand Down
3 changes: 2 additions & 1 deletion shared/src/main/java/com/optimizely/ab/android/shared/ServiceScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,8 @@ public PendingIntent getPendingIntent(Intent intent) {
}

private PendingIntent getPendingIntent(Intent intent, int flag) {
return PendingIntent.getService(context, 0, intent, flag);
// Android 31+ requires FLAG_IMMUTABLE explicitly
return PendingIntent.getService(context, 0, intent, flag | PendingIntent.FLAG_IMMUTABLE);
}
}

Expand Down
12 changes: 7 additions & 5 deletions test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ dependencies {
// testImplementation 'com.optimizely.ab:android-sdk:1.0.0'
testImplementation project(':android-sdk')

androidTestImplementation('androidx.test.ext:junit:1.1.1')
//androidTestimplementation "androidx.annotation:annotation:$annotations_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
Expand Down
1 change: 1 addition & 0 deletions test-app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

<activity
android:name=".SplashScreenActivity"
android:exported="true"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
11 changes: 7 additions & 4 deletions user-profile/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,14 @@ dependencies {
testImplementation "org.mockito:mockito-core:$mockito_ver"
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"

androidTestImplementation "androidx.test.ext:junit:$androidx_test"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test"
// Set this dependency to build and run Espresso tests
androidTestImplementation "androidx.work:work-testing:$work_runtime"
androidTestImplementation "androidx.test.ext:junit:$androidx_test_junit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_ver"
// Set this dependency to use JUnit 4 rules
androidTestImplementation "androidx.test:rules:$androidx_test_rules"
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
Expand Down