Remove compatibility shims
--
PiperOrigin-RevId: 159464567
MOS_MIGRATED_REVID=159464567
diff --git a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
index 1d0591e..3f0a074 100644
--- a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
+++ b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
@@ -480,13 +480,7 @@
"""Returns a depset of Swift modules found on the given target."""
swift_modules = depset()
for modules in _getattr_as_list(target, 'swift.transitive_modules'):
- if type(modules) == 'depset':
- swift_modules += modules
- else:
- # TODO(b/37660812): Older version of swift_library used lists for
- # transitive modules. This branch is here for backwards compatibility.
- swift_modules += [modules]
-
+ swift_modules += modules
return swift_modules
diff --git a/src/TulsiGenerator/BazelAspectInfoExtractor.swift b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
index 088f81e..dd1d7e6 100644
--- a/src/TulsiGenerator/BazelAspectInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
@@ -156,9 +156,6 @@
"/\(aspectFileWorkspaceRelativePath)%\(aspect)",
"--output_groups=tulsi-info,-_,-default", // Build only the aspect artifacts.
"--experimental_show_artifacts", // Print the artifacts generated by the aspect.
- // TODO(b/37660812): This switch applies only to the newer versions of swift_library and
- // allows for backwards compatibility.
- "--define=tulsi.swift_library.output_depsets=true",
])
arguments.append(contentsOf: buildOptions)
arguments.append(contentsOf: targets)
