aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Ic658dcd28f913697389e54ab1827ff2011f34dc0 Change-Id: I9381e5a1ae784dfc916922e7c581ee29734732e0
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I04674514343b34c4c7c67cd9f2b8941dd6e2151e Change-Id: Ic658dcd28f913697389e54ab1827ff2011f34dc0
2023-12-12Allow mockito-kotlin use in host testsAndriy Kozachuk
Bug: 315908618 Test: m mockito-kotlin2 Change-Id: I04674514343b34c4c7c67cd9f2b8941dd6e2151e
2023-10-27Merge remote-tracking branch 'goog/mirror-aosp-main' into am: 97b4dba341Magdi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito-kotlin/+/25201535 Change-Id: I5309149ea7f3bd6489e6f442a8880453f2bcbebb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Merge remote-tracking branch 'goog/mirror-aosp-main' intoaml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_tz5_341510010aml_tet_341712060aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_odp_341717000aml_odp_341610000aml_neu_341510000aml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_ips_341611000aml_ips_341510000aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_cfg_341510000aml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_adb_341520010aml_adb_341517070aml_adb_340912530android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseaml_tz5_341510010Magdi
'udc-mainline-prod' Bug: 308181344 Test: TH Change-Id: Iff81d3b769a149fc25a8e0ab925f2ab9dfa6f601
2023-07-10Merge remote-tracking branch 'goog/mirror-aosp-main' into udc-qpr-dev am: ↵Roma Modi
02af0372ff am: 3d6853e2a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito-kotlin/+/23907557 Change-Id: I1239ef2aa5b508e885aea4f9c04dedf6f8539e7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Merge remote-tracking branch 'goog/mirror-aosp-main' into udc-qpr-dev am: ↵Roma Modi
02af0372ff Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito-kotlin/+/23907557 Change-Id: I3221553431da8b94cea2ca4505ae55a7438f3f53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2a am: b0a0259984 am: 76a8284fb5 am: ↵Sadaf Ebrahimi
edadb9a487 am: 37631f21fb am: 54534697e5 Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: I10cffa5851059f0c43665339e91bbd50576f0292 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2a am: b0a0259984 am: 76a8284fb5 am: ↵Sadaf Ebrahimi
edadb9a487 am: 37631f21fb Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: I86239048e4dd3289de18c114b5552e7a5aacbd0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2a am: b0a0259984 am: 76a8284fb5 am: edadb9a487Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: I7404f0fa2dfc27874b9ea46e13668b45631b38dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2a am: b0a0259984 am: 76a8284fb5Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: I0ec6b2f2f123006c2095b5a242cc90deea330a58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2a am: b0a0259984Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: Ia8a45fa1ca5668e534f2ce85a7fc725a9f92bdce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Fix typo in METADATA am: 9674303d2aSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2650359 Change-Id: I18e645946c8be6e95e1aa57c5f1f5cfe4aefb7ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge remote-tracking branch 'goog/mirror-aosp-main' into udc-qpr-devRoma Modi
Test: TH Change-Id: I3075e39c40bb0293099a2488e25e67cd714c9402
2023-07-06Fix typo in METADATASadaf Ebrahimi
Test: TreeHugger Change-Id: I89b7cf048a92eb5a8a83364c4158054a9d6351ab
2023-07-06Add Android.bp and metadata files am: 3300121535 am: f59a530caf am: ↵Roma Modi
7ae2cbb5c3 am: 5532600498 am: 34e6849a7c am: b24e08cecb Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: I6808917f7afa47fa709089f25829936edee07713 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge tag '2.2.11' into master am: bbf428a7ce am: f0efadd358 am: 3b3c04a147 ↵Roma Modi
am: 93986f7d2b am: 1b0214e2b8 am: 4614b2adb0 Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: Ie1a00b6030ac281ada1647c59b14a171cd421d20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Add Android.bp and metadata files am: 3300121535 am: f59a530caf am: ↵Roma Modi
7ae2cbb5c3 am: 5532600498 am: 34e6849a7c Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: I2d37b0d372a9045c5a9c6184f396cf72c17a149c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Merge tag '2.2.11' into master am: bbf428a7ce am: f0efadd358 am: 3b3c04a147 ↵Roma Modi
am: 93986f7d2b am: 1b0214e2b8 Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: I59573f47d9f2145ff71b7dbcde94a461ed6a207f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Add Android.bp and metadata files am: 3300121535 am: f59a530caf am: ↵Roma Modi
7ae2cbb5c3 am: 5532600498 Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: If39883abe629f5daa0a6bfb6cb866b020869a8c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Merge tag '2.2.11' into master am: bbf428a7ce am: f0efadd358 am: 3b3c04a147 ↵Roma Modi
am: 93986f7d2b Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: Ib12b90ca01ea4c93524321aa888c79abcef29976 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Add Android.bp and metadata files am: 3300121535 am: f59a530caf am: 7ae2cbb5c3Roma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: I0427a9faa299481fee9b5fad52380d6571fef944 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Merge tag '2.2.11' into master am: bbf428a7ce am: f0efadd358 am: 3b3c04a147Roma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: Idbf1614ddf97539156a3b76f18f5d7a175adfa4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Add Android.bp and metadata files am: 3300121535 am: f59a530cafRoma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: I1c2b7ff4e2f0aaa56b581680ca00d2823df8dae6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Merge tag '2.2.11' into master am: bbf428a7ce am: f0efadd358Roma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: I0a450000de9a072673e096edb24ada6acb46c26c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Add Android.bp and metadata files am: 3300121535Roma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647761 Change-Id: I08f1b824419f67d8f0d24645be78c65c562b015d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05Merge tag '2.2.11' into master am: bbf428a7ceRoma Modi
Original change: https://android-review.googlesource.com/c/platform/external/mockito-kotlin/+/2647760 Change-Id: I41d133628286217ff1b829587a7cc3029ae26980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Add Android.bp and metadata filesRoma Modi
Test: treehugger Change-Id: Id3484652f3314110e3afb1a2d7bee41a2a44271f
2023-06-30Merge tag '2.2.11' into masterRoma Modi
Test: treehugger Change-Id: I768a92a5ffa9c9bd1088b0196897293e58272702
2023-06-22Initial empty repositoryplatform-tools-34.0.4main-16kInna Palant
2021-03-23Retrieve correct version number in Maven Central badge (#419)Jan-Hendrik Peters
2021-03-23Add all IntelliJ files to gitignore (#415)Jan-Hendrik Peters
2021-03-23Fix artifact groupId in Maven Central badge (#416)Jan-Hendrik Peters
2021-03-22Update groupId in installation instructions (#414)Mario Rezende
2021-03-22Merge pull request #413 from mockito/sfSzczepan Faber
Fixed group assignment
2021-03-22Fixed group assignmentSzczepan Faber
2021-03-22Merge pull request #411 from mockito/mockitoguy-patch-2Szczepan Faber
Enabled releases to Maven Central
2021-03-22Enabled automated releasesSzczepan Faber
2021-03-22Update ci.ymlSzczepan Faber
2021-03-22Merge pull request #412 from mockito/sfSzczepan Faber
Enabled automated releases
2021-03-22Enabled automated releasesSzczepan Faber
2021-03-16Merge pull request #410 from mockito/rename-packageSzczepan Faber
Rename packages to org.mockito.kotlin
2021-03-16Rename packages to org.mockito.kotlinTim van der Lippe
2021-03-14Merge pull request #409 from mockito/sfSzczepan Faber
Automated releases
2021-03-13Automated releasesSzczepan Faber
2021-02-08Merge pull request #405 from mockito/mockitoguy-patch-1Szczepan Faber
Enabled releases to GitHub and Bintray
2021-01-27Enabled releases to GitHub and BintraySzczepan Faber
2021-01-27Merge pull request #402 from mockito/sfSzczepan Faber
Added CI + Bintray releases
2021-01-27Bumped GradleSzczepan Faber
2021-01-25Removed unused pluginSzczepan Faber
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 08:01:34 +0000