8000 [FSSDK-10505] chore: update mockito and java version by muzahidul-opti · Pull Request #502 · optimizely/android-sdk · GitHub
[go: up one dir, main page]
Skip to content

[FSSDK-10505] chore: update mockito and java version #502

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 20 commits into from
Jan 3, 2025
Merged

[FSSDK-10505] chore: update mockito and java version #502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ba69fe4
wip: - power mock depdency remove
muzahidul-opti Dec 9, 2024
686069d
wip: update piple line java version
muzahidul-opti Dec 9, 2024
67d139a
wip: odp module build successfull
muzahidul-opti Dec 9, 2024
aeacc47
wip: shared module build success
muzahidul-opti Dec 9, 2024
a6949df
wip: user profile build done
muzahidul-opti Dec 9, 2024
100d114
wip: datafile handler build done
muzahidul-opti Dec 9, 2024
5c75d58
wip: datafile-handler gradle updated
muzahidul-opti Dec 9, 2024
4020086
wip: evenhandler build successfull
muzahidul-opti Dec 9, 2024
db50aff
wip: sdk bundle build successfull
muzahidul-opti Dec 10, 2024
2254f1e
wip: android-sdk instrumental test done
muzahidul-opti Dec 11, 2024
011d910
wip: compile option updated to java 17
muzahidul-opti Dec 11, 2024
0fa332b
wip: buidl successfull except reflection issue
muzahidul-opti Dec 12, 2024
a9f5695
wip: reflection issue resolved
muzahidul-opti Dec 12, 2024
0d44548
wip: clean up
muzahidul-opti Dec 12, 2024
7ad27d3
wip: clean up
muzahidul-opti Dec 12, 2024
195d8c0
wip: update build java distribution
muzahidul-opti Dec 12, 2024
6472ae0
wip: java distrbution updated
muzahidul-opti Dec 12, 2024
f149b81
wip: java version update
muzahidul-opti Dec 12, 2024
2f72c4b
fix: update testcases for DefaultUserProfileServiceTest
muzahidul-opti Dec 26, 2024
9ac19b1
clean up
muzahidul-opti Dec 31, 2024
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
Prev Previous commit
Next Next commit
wip: odp module build successfull
  • Loading branch information
@muzahidul-opti
muzahidul-opti committed Dec 9, 2024
commit 67d139a01e6638cc7060b2fdae9e977e2965dcef
8 changes: 5 additions & 3 deletions odp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ dependencies {

testImplementation "junit:junit:$junit_ver"
testImplementation "org.mockito:mockito-core:$mockito_ver"
// testImplementation "org.mockito.kotlin:mockito-kotlin:$mockito_ver"

compileOnly "com.noveogroup.android:android-logger:$android_logger_ver"

Expand All @@ -73,7 +74,8 @@ dependencies {
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"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
// androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
// androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
// androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
}
2 changes: 1 addition & 1 deletion odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt
View file
Open in desktop
8000
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.mock
import org.mockito.Mockito.*
import org.mockito.Mockito.verify

@RunWith(AndroidJUnit4::class)
Expand Down
6 changes: 3 additions & 3 deletions odp/src/androidTest/java/com/optimizely/ab/android/odp/ODPEventClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.Matchers.any
import org.mockito.Matchers.contains
import org.mockito.Matchers.eq
import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.contains
import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.Mockito.verify
Expand Down
6 changes: 3 additions & 3 deletions odp/src/androidTest/java/com/optimizely/ab/android/odp/ODPSegmentClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.Matchers.any
import org.mockito.Matchers.contains
import org.mockito.Matchers.eq
import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.contains
import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.Mockito.verify
Expand Down
0