@@ -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(extensionName , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
19+ scope.extensions.create(" " , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
2020 .also {
2121 CodeArtifactRepositoryExtension .store[" " ] = it
2222 }
2323 }
2424
2525 is Project -> {
26- scope.extensions.create(extensionName , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
26+ scope.extensions.create(" " , CodeArtifactRepositoryExtension ::class .java, scope.extensions)
2727 .also {
2828 CodeArtifactRepositoryExtension .store[" " ] = it
2929 }
@@ -34,18 +34,14 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
3434 }
3535 }
3636 }
37-
38- companion object {
39- const val extensionName = " CodeArtifactRepository"
40- }
4137}
4238
4339inline fun Settings.codeArtifactRepository (configure : CodeArtifactRepositoryExtension .() -> Unit ) {
44- extensions.getByName<CodeArtifactRepositoryExtension >(CodeArtifactRepositoryPlugin .extensionName ).configure()
40+ extensions.getByName<CodeArtifactRepositoryExtension >(" " ).configure()
4541}
4642
4743inline fun Project.codeArtifactRepository (configure : CodeArtifactRepositoryExtension .() -> Unit ) {
48- extensions.getByName<CodeArtifactRepositoryExtension >(CodeArtifactRepositoryPlugin .extensionName ).configure()
44+ extensions.getByName<CodeArtifactRepositoryExtension >(" " ).configure()
4945}
5046
5147/* *
@@ -58,9 +54,8 @@ fun RepositoryHandler.codeArtifact(domain: String, repository: String): MavenArt
5854 * Use CodeArtifact by additional name
5955 */
6056fun RepositoryHandler.codeArtifact (additionalName : String , domain : String , repository : String ) = maven {
61- val extensionName = " $additionalName${CodeArtifactRepositoryPlugin .extensionName} "
6257 CodeArtifactRepositoryExtension .store[additionalName]?.let {
63- name = listOf (extensionName , domain, repository).joinToString(" " ) { it.capitalized() }
58+ name = listOf (additionalName , domain, repository).joinToString(" " ) { it.capitalized() }
6459 url = URI .create(it.repositoryEndpointResponse(domain, repository).repositoryEndpoint())
6560 credentials {
6661 username = " aws"
@@ -87,8 +82,7 @@ fun codeArtifactUri(domain: String, repository: String, format: String): URI =
8782 * the default extension
8883 */
8984fun codeArtifactToken (additionalName : String , domain : String ): String {
90- val extensionName = " $additionalName${CodeArtifactRepositoryPlugin .extensionName} "
91- val settings = CodeArtifactRepositoryExtension .store[extensionName]
85+ val settings = CodeArtifactRepositoryExtension .store[additionalName]
9286 ? : throw GradleException (" didn't find CodeArtifactRepositoryExtension with the name: $" )
9387 return settings.authorizationTokenResponse(domain).authorizationToken()
9488}
@@ -100,8 +94,7 @@ fun codeArtifactToken(additionalName: String, domain: String): String {
10094 * the default extension
10195 */
10296fun 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]
10598 ? : throw GradleException (" didn't find CodeArtifactRepositoryExtension with the name: $" )
10699 return settings.repositoryEndpointResponse(domain, repository, format).repositoryEndpoint().let { URI .create(it) }
107100}
0 commit comments