Skip to content
This repository was archived by the owner on Dec 18, 2022. It is now read-only.

Commit 56e0b1c

Browse files
committed
merge topl-service-settings/prefs modules with topl-service
1 parent 610f5ec commit 56e0b1c

File tree

24 files changed

+46
-379
lines changed

24 files changed

+46
-379
lines changed

sampleapp/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
implementation fileTree(dir: "libs", include: ["*.jar"])
4040
implementation project(':topl-core-base')
4141
implementation project(':topl-service')
42-
implementation project(':topl-service-settings')
4342
implementation deps.kotlin.stdlib
4443
implementation deps.androidx.core
4544
implementation deps.androidx.appCompat

settings.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ include ':sampleapp'
33
include ':topl-core'
44
include ':topl-core-base'
55
include ':topl-service'
6-
include ':topl-service-prefs'
7-
include ':topl-service-settings'

topl-core/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ android {
3737
dependencies {
3838
implementation fileTree(dir: "libs", include: ["*.jar"])
3939
implementation project(':topl-core-base')
40-
implementation project(':topl-service-prefs')
41-
implementation project(':topl-service-settings')
4240
implementation deps.androidx.core
4341
implementation deps.jtorctl
4442
implementation deps.kotlin.stdlib

topl-service-prefs/.gitignore

-1
This file was deleted.

topl-service-prefs/build.gradle

-49
This file was deleted.

topl-service-prefs/consumer-rules.pro

Whitespace-only changes.

topl-service-prefs/proguard-rules.pro

-21
This file was deleted.

topl-service-prefs/src/main/AndroidManifest.xml

-2
This file was deleted.

topl-service-settings/.gitignore

-1
This file was deleted.

topl-service-settings/build.gradle

-51
This file was deleted.

topl-service-settings/consumer-rules.pro

Whitespace-only changes.

topl-service-settings/proguard-rules.pro

-21
This file was deleted.

topl-service-settings/src/main/AndroidManifest.xml

-3
This file was deleted.

topl-service-settings/src/test/java/io/matthewnelson/topl_service_settings/TestTorSettings.kt

-117
This file was deleted.

topl-service-settings/src/test/java/io/matthewnelson/topl_service_settings/TorServiceSettingsUnitTest.kt

-64
This file was deleted.

topl-service/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ dependencies {
3838
implementation fileTree(dir: "libs", include: ["*.jar"])
3939
implementation project(':topl-core')
4040
implementation project(':topl-core-base')
41-
implementation project(':topl-service-prefs')
42-
implementation project(':topl-service-settings')
43-
implementation deps.kotlin.stdlib
4441
implementation deps.androidx.localBroadcastManager
4542
implementation deps.androidx.core
46-
implementation deps.kotlin.coroutinesCore
4743
implementation deps.jtorctl
44+
implementation deps.kotlin.coroutinesCore
45+
implementation deps.kotlin.stdlib
4846

47+
testImplementation deps.androidx.test.core
4948
testImplementation deps.junit
49+
testImplementation deps.robolectric
5050

5151
androidTestImplementation deps.androidx.test.core
52-
androidTestImplementation deps.androidx.test.junit
5352
androidTestImplementation deps.androidx.test.espresso
53+
androidTestImplementation deps.androidx.test.junit
5454
}

0 commit comments

Comments
 (0)