Skip to content

Commit 4ab62a6

Browse files
committed
Redo DI gradle setup code
1 parent 6027651 commit 4ab62a6

File tree

85 files changed

+215
-259
lines changed

Some content is hidden

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

85 files changed

+215
-259
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.android.build.gradle.tasks.GenerateBuildConfig
1313
import com.google.firebase.appdistribution.gradle.firebaseAppDistribution
1414
import config.BuildTimeConfig
1515
import extension.AssetCopyTask
16-
import extension.ComponentMergingStrategy
1716
import extension.GitBranchNameValueSource
1817
import extension.GitRevisionValueSource
1918
import extension.allEnterpriseImpl
@@ -23,7 +22,7 @@ import extension.allServicesImpl
2322
import extension.buildConfigFieldStr
2423
import extension.koverDependencies
2524
import extension.locales
26-
import extension.setupAnvil
25+
import extension.setupDependencyInjection
2726
import extension.setupKover
2827
import java.util.Locale
2928

@@ -248,11 +247,7 @@ knit {
248247
}
249248
}
250249

251-
setupAnvil(
252-
generateDaggerCode = true,
253-
generateDaggerFactoriesUsingAnvil = false,
254-
componentMergingStrategy = ComponentMergingStrategy.KSP,
255-
)
250+
setupDependencyInjection()
256251

257252
dependencies {
258253
allLibrariesImpl()

appnav/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@file:Suppress("UnstableApiUsage")
99

1010
import extension.allFeaturesApi
11-
import extension.setupAnvil
11+
import extension.setupDependencyInjection
1212

1313
plugins {
1414
id("io.element.android-compose-library")
@@ -19,7 +19,7 @@ android {
1919
namespace = "io.element.android.appnav"
2020
}
2121

22-
setupAnvil()
22+
setupDependencyInjection()
2323

2424
dependencies {
2525
allFeaturesApi(project)

features/analytics/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2023, 2024 New Vector Ltd.
@@ -16,7 +16,7 @@ android {
1616
namespace = "io.element.android.features.analytics.impl"
1717
}
1818

19-
setupAnvil()
19+
setupDependencyInjection()
2020

2121
dependencies {
2222
implementation(projects.libraries.androidutils)

features/cachecleaner/api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2023, 2024 New Vector Ltd.
@@ -15,7 +15,7 @@ android {
1515
namespace = "io.element.android.features.cachecleaner.api"
1616
}
1717

18-
setupAnvil()
18+
setupDependencyInjection()
1919

2020
dependencies {
2121
implementation(projects.libraries.architecture)

features/cachecleaner/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2023, 2024 New Vector Ltd.
@@ -15,7 +15,7 @@ android {
1515
namespace = "io.element.android.features.cachecleaner.impl"
1616
}
1717

18-
setupAnvil()
18+
setupDependencyInjection()
1919

2020
dependencies {
2121
api(projects.features.cachecleaner.api)

features/call/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import extension.buildConfigFieldStr
22
import extension.readLocalProperty
3-
import extension.setupAnvil
3+
import extension.setupDependencyInjection
44

55
/*
66
* Copyright 2024 New Vector Ltd.
@@ -60,7 +60,7 @@ android {
6060
}
6161
}
6262

63-
setupAnvil()
63+
setupDependencyInjection()
6464

6565
dependencies {
6666
implementation(projects.appconfig)

features/changeroommemberroles/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2025 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
2222
}
2323
}
2424

25-
setupAnvil()
25+
setupDependencyInjection()
2626

2727
dependencies {
2828
api(projects.features.changeroommemberroles.api)

features/createroom/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2022-2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
2222
}
2323
}
2424

25-
setupAnvil()
25+
setupDependencyInjection()
2626

2727
dependencies {
2828
implementation(projects.libraries.core)

features/deactivation/impl/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
2222
}
2323
}
2424

25-
setupAnvil()
25+
setupDependencyInjection()
2626

2727
dependencies {
2828
implementation(projects.libraries.androidutils)

features/enterprise/impl-foss/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import extension.setupAnvil
1+
import extension.setupDependencyInjection
22

33
/*
44
* Copyright 2024 New Vector Ltd.
@@ -14,7 +14,7 @@ android {
1414
namespace = "io.element.android.features.enterprise.impl"
1515
}
1616

17-
setupAnvil()
17+
setupDependencyInjection()
1818

1919
dependencies {
2020
implementation(libs.compound)

0 commit comments

Comments
 (0)