Skip to content

Commit 1a245fc

Browse files
authored
Move internal features out of app module (duckduckgo#3362)
Task/Issue URL: https://app.asana.com/0/488551667048375/1205077183964550/f ### Description Move the internal features out of `:app` module Had to create a `:common-ui-internal` module to move the `ThemesPreviewInternalFeature` in there and incidentally re-org'ed the `common` modules ### Steps to test this PR smoke test internal features. verify internal features don't appear in play build
1 parent 04b00f6 commit 1a245fc

442 files changed

Lines changed: 201 additions & 78 deletions

File tree

Some content is hidden

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

‎ad-click/ad-click-impl/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
implementation project(path: ':anvil-annotations')
3535
implementation project(path: ':ad-click-api')
3636
implementation project(path: ':di')
37-
implementation project(path: ':common')
37+
implementation project(path: ':common-utils')
3838
implementation project(path: ':statistics')
3939
implementation project(path: ':privacy-config-api')
4040
implementation project(path: ':feature-toggles-api')

‎ad-click/ad-click-store/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
2424

2525
dependencies {
26-
implementation project(path: ':common')
26+
implementation project(path: ':common-utils')
2727
implementation project(path: ':ad-click-api')
2828
implementation Kotlin.stdlib.jdk7
2929
implementation AndroidX.core.ktx

‎anrs/anrs-impl/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
implementation project(':app-build-config-api')
2727
implementation project(':anrs-api')
2828
implementation project(':anrs-store')
29-
implementation project(':common')
29+
implementation project(':common-utils')
3030
implementation project(':di')
3131
implementation project(':browser-api')
3232
implementation project(':statistics')

‎anrs/anrs-store/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
2424

2525
dependencies {
26-
implementation project(path: ':common')
26+
implementation project(path: ':common-utils')
2727

2828
implementation Kotlin.stdlib.jdk7
2929
implementation AndroidX.core.ktx

‎app-tracking-protection/vpn-impl/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
implementation project(path: ':app-store')
4949
implementation project(path: ':browser-api')
5050
implementation project(path: ':di')
51-
implementation project(path: ':common')
51+
implementation project(path: ':common-utils')
5252
implementation project(path: ':common-ui')
5353
implementation project(path: ':statistics')
5454
implementation project(path: ':app-build-config-api')

‎app-tracking-protection/vpn-internal/build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,19 @@ android {
3232
}
3333

3434
dependencies {
35-
anvil project(path: ':anvil-compiler')
36-
implementation project(path: ':anvil-annotations')
37-
38-
implementation project(path: ':vpn-impl')
39-
implementation project(path: ':vpn-store')
40-
implementation project(path: ':vpn-api')
41-
implementation project(path: ':app-tracking-api')
42-
implementation project(path: ':di')
43-
implementation project(path: ':common')
44-
implementation project(path: ':common-ui')
45-
implementation project(path: ':app-build-config-api')
46-
implementation project(path: ':feature-toggles-api')
35+
anvil project(':anvil-compiler')
36+
implementation project(':anvil-annotations')
37+
38+
implementation project(':vpn-impl')
39+
implementation project(':vpn-store')
40+
implementation project(':vpn-api')
41+
implementation project(':app-tracking-api')
42+
implementation project(':di')
43+
implementation project(':common-utils')
44+
implementation project(':common-ui')
45+
implementation project(':app-build-config-api')
46+
implementation project(':feature-toggles-api')
47+
implementation project(':internal-features-api')
4748
implementation project(':navigation-api')
4849

4950
implementation Kotlin.stdlib.jdk7

app/src/internal/java/com/duckduckgo/app/feature/VpnInternalSettingsFeature.kt renamed to app-tracking-protection/vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/VpnInternalSettingsFeature.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 DuckDuckGo
2+
* Copyright (c) 2023 DuckDuckGo
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duckduckgo.app.feature
17+
package com.duckduckgo.vpn.internal.feature
1818

1919
import android.content.Context
2020
import com.duckduckgo.di.scopes.AppScope
2121
import com.duckduckgo.internal.features.api.InternalFeaturePlugin
2222
import com.duckduckgo.navigation.api.GlobalActivityStarter
23-
import com.duckduckgo.vpn.internal.feature.LaunchVpnInternalScreenWithEmptyParams
2423
import com.squareup.anvil.annotations.ContributesMultibinding
2524
import javax.inject.Inject
2625

‎app-tracking-protection/vpn-store/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444

4545
dependencies {
4646

47-
implementation project(path: ':common')
47+
implementation project(path: ':common-utils')
4848
implementation project(path: ':vpn-api')
4949
implementation project(path: ':feature-toggles-api')
5050
implementation project(path: ':app-build-config-api')

‎app/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,10 @@ dependencies {
176176
implementation project(':app-build-config-api')
177177
implementation project(':browser-api')
178178
implementation project(':statistics')
179-
implementation project(':common')
179+
implementation project(':common-utils')
180180
implementation project(':app-store')
181181
implementation project(':common-ui')
182+
internalImplementation project(':common-ui-internal')
182183
implementation project(':di')
183184
implementation project(':app-tracking-api')
184185
implementation project(':vpn-impl')
@@ -261,6 +262,7 @@ dependencies {
261262

262263
implementation project(':sync-api')
263264
implementation project(':sync-impl')
265+
implementation project(':sync-internal')
264266
implementation project(':sync-store')
265267
implementation project(':sync-lib')
266268

‎app/src/internal/res/values/donottranslate.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,4 @@
7676
<string name="surrogatesSubtitle">Main frame and iFrame should be green.</string>
7777
<string name="surrogatesDisabledTitle">Surrogates Disabled</string>
7878
<string name="surrogatesDisabledSubtitle">Main frame and iFrame should be red.</string>
79-
80-
<!-- sync dev settings -->
81-
<string name="syncSettingsTitle">Sync Dev Settings</string>
82-
<string name="syncSettingsSubtitle">Sync Dev Internal Test</string>
8379
</resources>

0 commit comments

Comments
 (0)