Skip to content
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

[FSSDK-10505] chore: update api level #503

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[FSSDK-10505] chore: update api level #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44d9f5e
Update gradle to 7.3.3
muzahidul-opti Jan 3, 2025
a56bd91
wip: set gradle 7.5
muzahidul-opti Jan 3, 2025
187a8d4
fix: kotline compile issue resolved
muzahidul-opti Jan 3, 2025
bcd9671
fix: update matrix
muzahidul-opti Jan 3, 2025
20f21b6
Merge branch 'master' into muzahid/gradle-fix
muzahidul-opti Jan 28, 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
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
strategy:
fail-fast: false
matrix:
api-level: [21, 25, 26, 29]
api-level: [24, 25, 26, 29]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Thu Jan 28 11:38:35 PST 2021
#Fri Jan 03 20:03:08 BDT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
org.gradle.jvmargs=-Xmx1g
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3 changes: 1 addition & 2 deletions odp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ android {
targetCompatibility JavaVersion.VERSION_17
}
buildToolsVersion build_tools_version

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see "sourceCompatibility JavaVersion.VERSION_17" upgraded above. It makes sense aligning them together, but not sure about if this upgrade is safe. We still need support old android devices minSdkVersion = 21+

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got your point. This PR follows up on the ticket.
To add support for java 17, we need to upgrade mocktio 4+, but mockito 4+ is only supported from api label <24

}
}

Expand Down
2 changes: 1 addition & 1 deletion odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.*
import org.mockito.Mockito.mock
import org.mockito.Mockito.verify

@RunWith(AndroidJUnit4::class)
Expand Down
Loading