Skip to content

Upgrade targetSDK to 35 #516

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
Oct 31, 2025
Merged

Upgrade targetSDK to 35 #516

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
13bc880
upgrade android to 35
jaeopt Oct 29, 2025
ca86f4e
upgrade targetSDK and gradle versions
jaeopt Oct 29, 2025
8d660b3
clean up github workflow
jaeopt Oct 29, 2025
6f6407a
fix gradle settings
jaeopt Oct 29, 2025
f612e79
clean up
jaeopt Oct 29, 2025
23536be
fix for API 21 tests
jaeopt Oct 29, 2025
fccb5cd
clean up
jaeopt Oct 29, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ jobs:
- name: checkout
uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
- name: Enable KVM
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
Expand Down
19 changes: 10 additions & 9 deletions android-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion compile_sdk_version
namespace "com.optimizely.ab.android.sdk"
compileSdk compile_sdk_version
buildToolsVersion build_tools_version

defaultConfig {
Expand All @@ -32,6 +33,10 @@ android {
// these rules will be merged to app's proguard rules
consumerProguardFiles '../proguard-rules.txt'
}

buildFeatures {
buildConfig true
}
testOptions {
unitTests.returnDefaultValues = true
unitTests.all {
Expand All @@ -52,11 +57,6 @@ android {
testCoverageEnabled true
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

repositories {
Expand Down Expand Up @@ -95,12 +95,13 @@ dependencies {
androidTestImplementation "androidx.test:core:$androidx_test_core"
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"

androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
androidTestImplementation "org.mockito:mockito-core:$mockito_ver_sdk_module"
androidTestImplementation "org.mockito:mockito-android:$mockito_ver_sdk_module"
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
androidTestImplementation "com.google.code.gson:gson:$gson_ver"
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}


48 changes: 24 additions & 24 deletions android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;

@RunWith(Parameterized.class)
Expand Down Expand Up @@ -431,7 +431,7 @@ public void testGoodForcedTrack() {

optimizelyClient.track("test_event", GENERIC_USER_ID);

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
try {
Expand Down Expand Up @@ -462,7 +462,7 @@ public void testGoodTrack() {
OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely,
logger);
optimizelyClient.track("test_event", GENERIC_USER_ID);
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

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

}

Expand Down Expand Up @@ -512,7 +512,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
else {
assertEquals(true, numberOfCalls[0]);
}
verifyNoInteractions(logger);
verifyZeroInteractions(logger);

}

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

@Test
Expand Down Expand Up @@ -569,7 +569,7 @@ public void testGoodForcedTrackAttribute() {

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

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

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

Expand Down Expand Up @@ -611,7 +611,7 @@ public void testGoodTrackAttribute() {

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

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

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

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

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

Expand Down Expand Up @@ -705,7 +705,7 @@ public void testGoodTrackEventVal() {
GENERIC_USER_ID,
Collections.<String, String>emptyMap(),
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

@Test
Expand Down Expand Up @@ -750,7 +750,7 @@ public void testGoodTrackAttributeEventVal() {
final HashMap<String, String> attributes = new HashMap<>();
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes,
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

@Test
Expand All @@ -770,7 +770,7 @@ public void testGoodForcedTrackAttributeEventVal() {
attributes,
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

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

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

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

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
assertEquals(v.getKey(), "var_2");
Expand Down Expand Up @@ -979,7 +979,7 @@ public void testGoodGetVariationAttribute() {
logger);
final HashMap<String, String> attributes = new HashMap<>();
optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

@Test
Expand All @@ -996,7 +996,7 @@ public void testGoodForcedGetVariationAttribute() {

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

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

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

Expand Down Expand Up @@ -1180,7 +1180,7 @@ public void testGoodIsFeatureEnabledWithAttribute() {
Collections.singletonMap("house", "Gryffindor")
));

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

assertFalse(optimizelyClient.isFeatureEnabled(
"InvalidFeatureKey",
Expand Down Expand Up @@ -1301,7 +1301,7 @@ public void testIsFeatureEnabledWithFeatureEnabledTrue(){
Collections.singletonMap("house", "Gryffindor")
));

verifyNoInteractions(logger);
verifyZeroInteractions(logger);

}

Expand Down Expand Up @@ -1398,7 +1398,7 @@ public void testGoodGetFeatureVariableBooleanWithAttr() {
GENERIC_USER_ID,
Collections.singletonMap("key", "value")
));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);

}

Expand Down Expand Up @@ -1505,7 +1505,7 @@ public void testGoodGetFeatureVariableDoubleWithAttr() {
GENERIC_USER_ID,
Collections.singletonMap("house", "Gryffindor")
));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

//FeatureVariableDouble Scenario#3 if feature not found
Expand Down Expand Up @@ -1616,7 +1616,7 @@ public void testGoodGetFeatureVariableIntegerWithAttr() {
GENERIC_USER_ID,
Collections.singletonMap("house", "Gryffindor")
));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

//FeatureVariableInteger Scenario#3 if feature not found
Expand Down Expand Up @@ -1723,7 +1723,7 @@ public void testGoodGetFeatureVariableStringWithAttr() {
GENERIC_USER_ID,
Collections.singletonMap("house", "Gryffindor")
));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

//FeatureVariableString Scenario#3 if feature not found
Expand Down Expand Up @@ -1837,7 +1837,7 @@ public void testGetFeatureVariableJsonWithAttr() {
);

assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

//FeatureVariableJSON Scenario#3 if feature not found
Expand Down Expand Up @@ -1949,7 +1949,7 @@ public void testGetAllFeatureVariablesWithAttr() {
);

assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
verifyNoInteractions(logger);
verifyZeroInteractions(logger);
}

//GetAllFeatureVariables Scenario#3 if feature not found
Expand Down
Loading
Loading