Skip to content

Commit d46ea99

Browse files
committed
Merge branch 'release/5.35.1'
2 parents aaca934 + f1f4b71 commit d46ea99

File tree

78 files changed

+594
-880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+594
-880
lines changed

Gemfile.lock

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
5-
addressable (2.5.2)
6-
public_suffix (>= 2.0.2, < 4.0)
4+
CFPropertyList (3.0.1)
5+
addressable (2.7.0)
6+
public_suffix (>= 2.0.2, < 5.0)
77
atomos (0.1.3)
8-
babosa (1.0.2)
9-
claide (1.0.2)
8+
babosa (1.0.3)
9+
claide (1.0.3)
1010
colored (1.2)
1111
colored2 (3.1.2)
1212
commander-fastlane (4.4.6)
1313
highline (~> 1.7.2)
1414
declarative (0.0.10)
1515
declarative-option (0.1.0)
1616
digest-crc (0.4.1)
17-
domain_name (0.5.20180417)
17+
domain_name (0.5.20190701)
1818
unf (>= 0.0.5, < 1.0.0)
19-
dotenv (2.5.0)
20-
emoji_regex (0.1.1)
21-
excon (0.62.0)
22-
faraday (0.15.3)
19+
dotenv (2.7.5)
20+
emoji_regex (1.0.1)
21+
excon (0.67.0)
22+
faraday (0.17.0)
2323
multipart-post (>= 1.2, < 3)
2424
faraday-cookie_jar (0.0.6)
2525
faraday (>= 0.7.4)
2626
http-cookie (~> 1.0.0)
27-
faraday_middleware (0.12.2)
27+
faraday_middleware (0.13.1)
2828
faraday (>= 0.7.4, < 1.0)
29-
fastimage (2.1.4)
30-
fastlane (2.127.1)
29+
fastimage (2.1.7)
30+
fastlane (2.134.0)
3131
CFPropertyList (>= 2.3, < 4.0.0)
3232
addressable (>= 2.3, < 3.0.0)
3333
babosa (>= 1.0.2, < 2.0.0)
@@ -37,22 +37,22 @@ GEM
3737
dotenv (>= 2.1.1, < 3.0.0)
3838
emoji_regex (>= 0.1, < 2.0)
3939
excon (>= 0.45.0, < 1.0.0)
40-
faraday (~> 0.9)
40+
faraday (~> 0.17)
4141
faraday-cookie_jar (~> 0.0.6)
42-
faraday_middleware (~> 0.9)
42+
faraday_middleware (~> 0.13.1)
4343
fastimage (>= 2.1.0, < 3.0.0)
4444
gh_inspector (>= 1.1.2, < 2.0.0)
4545
google-api-client (>= 0.21.2, < 0.24.0)
4646
google-cloud-storage (>= 1.15.0, < 2.0.0)
4747
highline (>= 1.7.2, < 2.0.0)
4848
json (< 3.0.0)
4949
jwt (~> 2.1.0)
50-
mini_magick (>= 4.9.4)
50+
mini_magick (>= 4.9.4, < 5.0.0)
5151
multi_xml (~> 0.5)
5252
multipart-post (~> 2.0.0)
5353
plist (>= 3.1.0, < 4.0.0)
5454
public_suffix (~> 2.0.0)
55-
rubyzip (>= 1.2.2, < 2.0.0)
55+
rubyzip (>= 1.3.0, < 2.0.0)
5656
security (= 0.1.3)
5757
simctl (~> 1.6.3)
5858
slack-notifier (>= 2.0.0, < 3.0.0)
@@ -74,72 +74,72 @@ GEM
7474
representable (~> 3.0)
7575
retriable (>= 2.0, < 4.0)
7676
signet (~> 0.9)
77-
google-cloud-core (1.3.0)
77+
google-cloud-core (1.3.2)
7878
google-cloud-env (~> 1.0)
79-
google-cloud-env (1.0.5)
79+
google-cloud-env (1.2.1)
8080
faraday (~> 0.11)
8181
google-cloud-storage (1.16.0)
8282
digest-crc (~> 0.4)
8383
google-api-client (~> 0.23)
8484
google-cloud-core (~> 1.2)
8585
googleauth (>= 0.6.2, < 0.10.0)
86-
googleauth (0.6.6)
86+
googleauth (0.6.7)
8787
faraday (~> 0.12)
8888
jwt (>= 1.4, < 3.0)
89-
memoist (~> 0.12)
89+
memoist (~> 0.16)
9090
multi_json (~> 1.11)
9191
os (>= 0.9, < 2.0)
9292
signet (~> 0.7)
9393
highline (1.7.10)
9494
http-cookie (1.0.3)
9595
domain_name (~> 0.5)
9696
httpclient (2.8.3)
97-
json (2.1.0)
97+
json (2.2.0)
9898
jwt (2.1.0)
9999
memoist (0.16.0)
100-
mime-types (3.2.2)
100+
mime-types (3.3)
101101
mime-types-data (~> 3.2015)
102-
mime-types-data (3.2018.0812)
103-
mini_magick (4.5.1)
104-
multi_json (1.13.1)
102+
mime-types-data (3.2019.1009)
103+
mini_magick (4.9.5)
104+
multi_json (1.14.1)
105105
multi_xml (0.6.0)
106106
multipart-post (2.0.0)
107107
nanaimo (0.2.6)
108108
naturally (2.2.0)
109-
os (1.0.0)
110-
plist (3.4.0)
109+
os (1.0.1)
110+
plist (3.5.0)
111111
public_suffix (2.0.5)
112112
representable (3.0.4)
113113
declarative (< 0.1.0)
114114
declarative-option (< 0.2.0)
115115
uber (< 0.2.0)
116116
retriable (3.1.2)
117117
rouge (2.0.7)
118-
rubyzip (1.2.2)
118+
rubyzip (1.3.0)
119119
security (0.1.3)
120-
signet (0.9.2)
120+
signet (0.12.0)
121121
addressable (~> 2.3)
122122
faraday (~> 0.9)
123123
jwt (>= 1.5, < 3.0)
124124
multi_json (~> 1.10)
125-
simctl (1.6.5)
125+
simctl (1.6.6)
126126
CFPropertyList
127127
naturally
128128
slack-notifier (2.3.2)
129129
terminal-notifier (2.0.0)
130130
terminal-table (1.8.0)
131131
unicode-display_width (~> 1.1, >= 1.1.1)
132-
tty-cursor (0.6.0)
133-
tty-screen (0.6.5)
134-
tty-spinner (0.8.0)
135-
tty-cursor (>= 0.5.0)
132+
tty-cursor (0.7.0)
133+
tty-screen (0.7.0)
134+
tty-spinner (0.9.1)
135+
tty-cursor (~> 0.7)
136136
uber (0.1.0)
137137
unf (0.1.4)
138138
unf_ext
139-
unf_ext (0.0.7.5)
140-
unicode-display_width (1.4.0)
139+
unf_ext (0.0.7.6)
140+
unicode-display_width (1.6.0)
141141
word_wrap (1.0.0)
142-
xcodeproj (1.8.2)
142+
xcodeproj (1.13.0)
143143
CFPropertyList (>= 2.3.3, < 4.0)
144144
atomos (~> 0.1.3)
145145
claide (>= 1.0.2, < 2.0)
@@ -158,4 +158,4 @@ DEPENDENCIES
158158
fastlane-plugin-property_file_read
159159

160160
BUNDLED WITH
161-
1.17.1
161+
1.17.2

app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.duckduckgo.app
1818

19+
import com.duckduckgo.app.global.DispatcherProvider
20+
import kotlinx.coroutines.CoroutineDispatcher
1921
import kotlinx.coroutines.Dispatchers
2022
import kotlinx.coroutines.ExperimentalCoroutinesApi
2123
import kotlinx.coroutines.test.TestCoroutineDispatcher
@@ -25,9 +27,15 @@ import org.junit.rules.TestWatcher
2527
import org.junit.runner.Description
2628

2729
@ExperimentalCoroutinesApi
28-
class CoroutineTestRule(
29-
private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
30-
) : TestWatcher() {
30+
class CoroutineTestRule(val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()) : TestWatcher() {
31+
32+
val testDispatcherProvider = object : DispatcherProvider {
33+
override fun default(): CoroutineDispatcher = testDispatcher
34+
override fun io(): CoroutineDispatcher = testDispatcher
35+
override fun main(): CoroutineDispatcher = testDispatcher
36+
override fun unconfined(): CoroutineDispatcher = testDispatcher
37+
38+
}
3139

3240
override fun starting(description: Description?) {
3341
super.starting(description)

0 commit comments

Comments
 (0)