@@ -16,14 +16,14 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
16
16
override fun apply (scope : Any ) {
17
17
when (scope) {
18
18
is Settings -> {
19
- scope.extensions.create(extensionName , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
19
+ scope.extensions.create(" " , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
20
20
.also {
21
21
CodeArtifactRepositoryExtension .store[" " ] = it
22
22
}
23
23
}
24
24
25
25
is Project -> {
26
- scope.extensions.create(extensionName , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
26
+ scope.extensions.create(" " , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
27
27
.also {
28
28
CodeArtifactRepositoryExtension .store[" " ] = it
29
29
}
@@ -34,18 +34,14 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
34
34
}
35
35
}
36
36
}
37
-
38
- companion object {
39
- const val extensionName = " CodeArtifactRepository"
40
- }
41
37
}
42
38
43
39
inline fun Settings.codeArtifactRepository (configure : CodeArtifactRepositoryExtension .() -> Unit ) {
44
- extensions.getByName<CodeArtifactRepositoryExtension >(CodeArtifactRepositoryPlugin .extensionName ).configure()
40
+ extensions.getByName<CodeArtifactRepositoryExtension >(" " ).configure()
45
41
}
46
42
47
43
inline fun Project.codeArtifactRepository (configure : CodeArtifactRepositoryExtension .() -> Unit ) {
48
- extensions.getByName<CodeArtifactRepositoryExtension >(CodeArtifactRepositoryPlugin .extensionName ).configure()
44
+ extensions.getByName<CodeArtifactRepositoryExtension >(" " ).configure()
49
45
}
50
46
51
47
/* *
@@ -58,9 +54,8 @@ fun RepositoryHandler.codeArtifact(domain: String, repository: String): MavenArt
58
54
* Use CodeArtifact by additional name
59
55
*/
60
56
fun RepositoryHandler.codeArtifact (additionalName : String , domain : String , repository : String ) = maven {
61
- val extensionName = " $additionalName${CodeArtifactRepositoryPlugin .extensionName} "
62
57
CodeArtifactRepositoryExtension .store[additionalName]?.let {
63
- name = listOf (extensionName , domain, repository).joinToString(" " ) { it.capitalized() }
58
+ name = listOf (additionalName , domain, repository).joinToString(" " ) { it.capitalized() }
64
59
url = URI .create(it.repositoryEndpointResponse(domain, repository).repositoryEndpoint())
65
60
credentials {
66
61
username = " aws"
@@ -87,8 +82,7 @@ fun codeArtifactUri(domain: String, repository: String, format: String): URI =
87
82
* the default extension
88
83
*/
89
84
fun codeArtifactToken (additionalName : String , domain : String ): String {
90
- val extensionName = " $additionalName${CodeArtifactRepositoryPlugin .extensionName} "
91
- val settings = CodeArtifactRepositoryExtension .store[extensionName]
85
+ val settings = CodeArtifactRepositoryExtension .store[additionalName]
92
86
? : throw GradleException (" didn't find CodeArtifactRepositoryExtension with the name: $" )
93
87
return settings.authorizationTokenResponse(domain).authorizationToken()
94
88
}
@@ -100,8 +94,7 @@ fun codeArtifactToken(additionalName: String, domain: String): String {
100
94
* the default extension
101
95
*/
102
96
fun codeArtifactUri (additionalName : String , domain : String , repository : String , format : String ): URI {
103
- val extensionName = " $additionalName${CodeArtifactRepositoryPlugin .extensionName} "
104
- val settings = CodeArtifactRepositoryExtension .store[extensionName]
97
+ val settings = CodeArtifactRepositoryExtension .store[additionalName]
105
98
? : throw GradleException (" didn't find CodeArtifactRepositoryExtension with the name: $" )
106
99
return settings.repositoryEndpointResponse(domain, repository, format).repositoryEndpoint().let { URI .create(it) }
107
100
}
0 commit comments