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

Commit 384fa68

Browse files
committed
Removed no longer needed MODULES_MINIMUMS_TO_TRACK
* MODULE_DEPENDENCY_MINIMUMS and versionModuleAligns already cover what MODULES_MINIMUMS_TO_TRACK was trying to do
1 parent 6f1ca59 commit 384fa68

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,6 @@ class GradleProjectPlugin implements Plugin<Project> {
235235
]
236236
]
237237

238-
// List containing all child entries of MODULE_DEPENDENCY_MINIMUMS
239-
static Map<String, Boolean> MODULES_MINIMUMS_TO_TRACK
240-
static void generateMinModulesToTrackStatic() {
241-
MODULES_MINIMUMS_TO_TRACK = [:]
242-
MODULE_DEPENDENCY_MINIMUMS.each { parentModule, parentVersion ->
243-
parentVersion.each { childModule, _childVersion ->
244-
MODULES_MINIMUMS_TO_TRACK[childModule] = true
245-
}
246-
}
247-
}
248-
249238
static Map<String, Object> versionModuleAligns
250239

251240
static def versionGroupAligns
@@ -281,8 +270,6 @@ class GradleProjectPlugin implements Plugin<Project> {
281270
shownWarnings = [:]
282271
versionModuleAligns = [:]
283272

284-
generateMinModulesToTrackStatic()
285-
286273
disableGMSVersionChecks()
287274
detectProjectState()
288275

@@ -828,21 +815,7 @@ class GradleProjectPlugin implements Plugin<Project> {
828815
static void updateVersionModuleAligns(String group, String module, String version) {
829816
def inputModule = "$group:$module"
830817

831-
// 1. Sets or updates versionModuleAligns of modules we need to enforce min versions on
832-
if (MODULES_MINIMUMS_TO_TRACK[inputModule]) {
833-
def curOverrideVersion = versionModuleAligns[inputModule]
834-
if (curOverrideVersion) {
835-
curOverrideVersion['version'] =
836-
acceptedOrIntersectVersion(
837-
version,
838-
curOverrideVersion['version'] as String
839-
)
840-
}
841-
else
842-
versionModuleAligns[inputModule] = [version: version]
843-
}
844-
845-
// 2. When we get a dependent version value parent's to a min version if needed
818+
// When we get a dependent version value parent's to a min version if needed
846819
def rule = MODULE_DEPENDENCY_MINIMUMS[inputModule]
847820
rule.each { parentVersion, dependentChildMinVersion ->
848821
def exactVersion = new ExactVersionSelector(parentVersion)

0 commit comments

Comments
 (0)