Skip to content

Commit 933870a

Browse files
author
Jan Gaebel
committed
refactor(extensions): reintroduce extension name
1 parent 20c7631 commit 933870a

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/main/kotlin/com/liftric/code/artifact/repository/CodeArtifactRepositoryExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ abstract class CodeArtifactRepositoryExtension(private val extensionContainer: E
66
fun additional(name: String, block: CodeArtifact.() -> Unit) {
77
if (name.isEmpty()) error("Empty domain is not supported!")
88
store[name] = extensionContainer.create(
9-
name,
9+
"${name}${CodeArtifactRepositoryPlugin.extensionName}",
1010
CodeArtifactRepositoryExtension::class.java,
1111
extensionContainer
1212
).apply {

src/main/kotlin/com/liftric/code/artifact/repository/CodeArtifactRepositoryPlugin.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
1616
override fun apply(scope: Any) {
1717
when (scope) {
1818
is Settings -> {
19-
scope.extensions.create("", CodeArtifactRepositoryExtension::class.java, scope.extensions)
19+
scope.extensions.create(extensionName, CodeArtifactRepositoryExtension::class.java, scope.extensions)
2020
.also {
2121
CodeArtifactRepositoryExtension.store[""] = it
2222
}
2323
}
2424

2525
is Project -> {
26-
scope.extensions.create("", CodeArtifactRepositoryExtension::class.java, scope.extensions)
26+
scope.extensions.create(extensionName, CodeArtifactRepositoryExtension::class.java, scope.extensions)
2727
.also {
2828
CodeArtifactRepositoryExtension.store[""] = it
2929
}
@@ -34,14 +34,18 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
3434
}
3535
}
3636
}
37+
38+
companion object {
39+
const val extensionName = "CodeArtifactRepository"
40+
}
3741
}
3842

3943
inline fun Settings.codeArtifactRepository(configure: CodeArtifactRepositoryExtension.() -> Unit) {
40-
extensions.getByName<CodeArtifactRepositoryExtension>("").configure()
44+
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.extensionName).configure()
4145
}
4246

4347
inline fun Project.codeArtifactRepository(configure: CodeArtifactRepositoryExtension.() -> Unit) {
44-
extensions.getByName<CodeArtifactRepositoryExtension>("").configure()
48+
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.extensionName).configure()
4549
}
4650

4751
/**

0 commit comments

Comments
 (0)