Skip to content

Commit 2f81f7e

Browse files
jaeoptjaeopt
authored
Upgrade targetSDK to 35 (#516)
1 parent b00f8f1 commit 2f81f7e

File tree

14 files changed

+124
-110
lines changed

14 files changed

+124
-110
lines changed

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ jobs:
8686
- name: checkout
8787
uses: actions/checkout@v4
8888
- name: set up JDK 17
89-
uses: actions/setup-java@v1
89+
uses: actions/setup-java@v4
9090
with:
9191
java-version: '17'
92+
distribution: 'temurin'
9293
- name: Enable KVM
9394
run: |
9495
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

‎android-sdk/build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ apply plugin: 'com.android.library'
1818
apply plugin: 'kotlin-android'
1919

2020
android {
21-
compileSdkVersion compile_sdk_version
21+
namespace "com.optimizely.ab.android.sdk"
22+
compileSdk compile_sdk_version
2223
buildToolsVersion build_tools_version
2324

2425
defaultConfig {
@@ -32,6 +33,10 @@ android {
3233
// these rules will be merged to app's proguard rules
3334
consumerProguardFiles '../proguard-rules.txt'
3435
}
36+
37+
buildFeatures {
38+
buildConfig true
39+
}
3540
testOptions {
3641
unitTests.returnDefaultValues = true
3742
unitTests.all {
@@ -52,11 +57,6 @@ android {
5257
testCoverageEnabled true
5358
}
5459
}
55-
56-
compileOptions {
57-
sourceCompatibility JavaVersion.VERSION_17
58-
targetCompatibility JavaVersion.VERSION_17
59-
}
6060
}
6161

6262
repositories {
@@ -95,12 +95,13 @@ dependencies {
9595
androidTestImplementation "androidx.test:core:$androidx_test_core"
9696
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"
9797

98-
androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
99-
androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
98+
androidTestImplementation "org.mockito:mockito-core:$mockito_ver_sdk_module"
99+
androidTestImplementation "org.mockito:mockito-android:$mockito_ver_sdk_module"
100100
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
101101
androidTestImplementation "com.google.code.gson:gson:$gson_ver"
102102
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
103-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
103+
104+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
104105
}
105106

106107

‎android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import static org.mockito.Mockito.mock;
8383
import static org.mockito.Mockito.spy;
8484
import static org.mockito.Mockito.verify;
85-
import static org.mockito.Mockito.verifyNoInteractions;
85+
import static org.mockito.Mockito.verifyZeroInteractions;
8686
import static org.mockito.Mockito.when;
8787

8888
@RunWith(Parameterized.class)
@@ -431,7 +431,7 @@ public void testGoodForcedTrack() {
431431

432432
optimizelyClient.track("test_event", GENERIC_USER_ID);
433433

434-
verifyNoInteractions(logger);
434+
verifyZeroInteractions(logger);
435435

436436
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
437437
try {
@@ -462,7 +462,7 @@ public void testGoodTrack() {
462462
OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely,
463463
logger);
464464
optimizelyClient.track("test_event", GENERIC_USER_ID);
465-
verifyNoInteractions(logger);
465+
verifyZeroInteractions(logger);
466466
}
467467

468468
@Test
@@ -484,7 +484,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
484484
assertTrue(notificationId <= 0);
485485
assertFalse(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId));
486486
assertEquals(false, numberOfCalls[0]);
487-
verifyNoInteractions(logger);
487+
verifyZeroInteractions(logger);
488488

489489
}
490490

@@ -512,7 +512,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
512512
else {
513513
assertEquals(true, numberOfCalls[0]);
514514
}
515-
verifyNoInteractions(logger);
515+
verifyZeroInteractions(logger);
516516

517517
}
518518

@@ -524,7 +524,7 @@ public void testGoodTrackBucketing() {
524524
Experiment experiment = optimizelyClient.getProjectConfig().getExperimentsForEventKey("test_event").get(0);
525525
attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
526526
optimizelyClient.track("test_event", "userId", attributes);
527-
verifyNoInteractions(logger);
527+
verifyZeroInteractions(logger);
528528
}
529529

530530
@Test
@@ -569,7 +569,7 @@ public void testGoodForcedTrackAttribute() {
569569

570570
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
571571

572-
verifyNoInteractions(logger);
572+
verifyZeroInteractions(logger);
573573

574574
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
575575

@@ -611,7 +611,7 @@ public void testGoodTrackAttribute() {
611611

612612
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
613613

614-
verifyNoInteractions(logger);
614+
verifyZeroInteractions(logger);
615615

616616
Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
617617
assertEquals(v.getKey(), "var_2");
@@ -671,7 +671,7 @@ public void testGoodForcedTrackEventVal() {
671671
Collections.<String, String>emptyMap(),
672672
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
673673

674-
verifyNoInteractions(logger);
674+
verifyZeroInteractions(logger);
675675

676676
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
677677

@@ -705,7 +705,7 @@ public void testGoodTrackEventVal() {
705705
GENERIC_USER_ID,
706706
Collections.<String, String>emptyMap(),
707707
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
708-
verifyNoInteractions(logger);
708+
verifyZeroInteractions(logger);
709709
}
710710

711711
@Test
@@ -750,7 +750,7 @@ public void testGoodTrackAttributeEventVal() {
750750
final HashMap<String, String> attributes = new HashMap<>();
751751
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes,
752752
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
753-
verifyNoInteractions(logger);
753+
verifyZeroInteractions(logger);
754754
}
755755

756756
@Test
@@ -770,7 +770,7 @@ public void testGoodForcedTrackAttributeEventVal() {
770770
attributes,
771771
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
772772

773-
verifyNoInteractions(logger);
773+
verifyZeroInteractions(logger);
774774

775775
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
776776

@@ -839,7 +839,7 @@ public void testTrackWithEventTags() {
839839
final HashMap<String, Object> eventTags = new HashMap<>();
840840
eventTags.put("foo", 843);
841841
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes, eventTags);
842-
verifyNoInteractions(logger);
842+
verifyZeroInteractions(logger);
843843
}
844844

845845
@Test
@@ -875,7 +875,7 @@ public void testForcedTrackWithEventTags() {
875875
// id of var_2
876876
assertTrue(logEvent.getBody().contains("\"enrich_decisions\":true"));
877877

878-
verifyNoInteractions(logger);
878+
verifyZeroInteractions(logger);
879879

880880
Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
881881
assertEquals(v.getKey(), "var_2");
@@ -979,7 +979,7 @@ public void testGoodGetVariationAttribute() {
979979
logger);
980980
final HashMap<String, String> attributes = new HashMap<>();
981981
optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
982-
verifyNoInteractions(logger);
982+
verifyZeroInteractions(logger);
983983
}
984984

985985
@Test
@@ -996,7 +996,7 @@ public void testGoodForcedGetVariationAttribute() {
996996

997997
v = optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
998998

999-
verifyNoInteractions(logger);
999+
verifyZeroInteractions(logger);
10001000

10011001
assertEquals(v.getKey(), "var_2");
10021002

@@ -1180,7 +1180,7 @@ public void testGoodIsFeatureEnabledWithAttribute() {
11801180
Collections.singletonMap("house", "Gryffindor")
11811181
));
11821182

1183-
verifyNoInteractions(logger);
1183+
verifyZeroInteractions(logger);
11841184

11851185
assertFalse(optimizelyClient.isFeatureEnabled(
11861186
"InvalidFeatureKey",
@@ -1301,7 +1301,7 @@ public void testIsFeatureEnabledWithFeatureEnabledTrue(){
13011301
Collections.singletonMap("house", "Gryffindor")
13021302
));
13031303

1304-
verifyNoInteractions(logger);
1304+
verifyZeroInteractions(logger);
13051305

13061306
}
13071307

@@ -1398,7 +1398,7 @@ public void testGoodGetFeatureVariableBooleanWithAttr() {
13981398
GENERIC_USER_ID,
13991399
Collections.singletonMap("key", "value")
14001400
));
1401-
verifyNoInteractions(logger);
1401+
verifyZeroInteractions(logger);
14021402

14031403
}
14041404

@@ -1505,7 +1505,7 @@ public void testGoodGetFeatureVariableDoubleWithAttr() {
15051505
GENERIC_USER_ID,
15061506
Collections.singletonMap("house", "Gryffindor")
15071507
));
1508-
verifyNoInteractions(logger);
1508+
verifyZeroInteractions(logger);
15091509
}
15101510

15111511
//FeatureVariableDouble Scenario#3 if feature not found
@@ -1616,7 +1616,7 @@ public void testGoodGetFeatureVariableIntegerWithAttr() {
16161616
GENERIC_USER_ID,
16171617
Collections.singletonMap("house", "Gryffindor")
16181618
));
1619-
verifyNoInteractions(logger);
1619+
verifyZeroInteractions(logger);
16201620
}
16211621

16221622
//FeatureVariableInteger Scenario#3 if feature not found
@@ -1723,7 +1723,7 @@ public void testGoodGetFeatureVariableStringWithAttr() {
17231723
GENERIC_USER_ID,
17241724
Collections.singletonMap("house", "Gryffindor")
17251725
));
1726-
verifyNoInteractions(logger);
1726+
verifyZeroInteractions(logger);
17271727
}
17281728

17291729
//FeatureVariableString Scenario#3 if feature not found
@@ -1837,7 +1837,7 @@ public void testGetFeatureVariableJsonWithAttr() {
18371837
);
18381838

18391839
assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
1840-
verifyNoInteractions(logger);
1840+
verifyZeroInteractions(logger);
18411841
}
18421842

18431843
//FeatureVariableJSON Scenario#3 if feature not found
@@ -1949,7 +1949,7 @@ public void testGetAllFeatureVariablesWithAttr() {
19491949
);
19501950

19511951
assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
1952-
verifyNoInteractions(logger);
1952+
verifyZeroInteractions(logger);
19531953
}
19541954

19551955
//GetAllFeatureVariables Scenario#3 if feature not found

0 commit comments

Comments
 (0)