Skip to content

Commit 7654f55

Browse files
nvimanvima
authored
Merge pull request #6 from Liftric/chore/update_dependencies
chore: update dependencies & gradle
2 parents cb45b12 + 9cc76b3 commit 7654f55

File tree

8 files changed

+90
-64
lines changed

8 files changed

+90
-64
lines changed

‎.github/workflows/pre-merge.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v3
2020
- name: Cache
21-
uses: gradle/gradle-build-action@v2
21+
uses: gradle/gradle-build-action@v2.4.2
2222
- name: Validate
2323
run: ./gradlew check validatePlugins --continue

‎.github/workflows/publish-plugin.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout
1616
uses: actions/checkout@v3
1717
- name: Cache
18-
uses: gradle/gradle-build-action@v2
18+
uses: gradle/gradle-build-action@v2.4.2
1919
- name: Validate
2020
run: ./gradlew check validatePlugins --continue
2121
- name: Publish

‎build.gradle.kts‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
22
import io.gitlab.arturbosch.detekt.Detekt
33

4+
@Suppress("DSL_SCOPE_VIOLATION") // IntelliJ incorrectly marks libs as not callable
45
plugins {
56
`kotlin-dsl`
67
`maven-publish`
@@ -18,7 +19,6 @@ dependencies {
1819
implementation(libs.aws.ecs)
1920
implementation(libs.aws.codeartifact)
2021
implementation(libs.aws.sts)
21-
testImplementation(libs.junit)
2222
}
2323

2424
ktlint {
@@ -62,29 +62,32 @@ tasks.withType<DependencyUpdatesTask> {
6262
}
6363
}
6464

65-
group = "com.liftric.code.artifact.repository"
66-
version = with(versioning.info) {
67-
if (branch == "HEAD" && dirty.not()) {
68-
tag
69-
} else {
70-
full
65+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
66+
kotlinOptions {
67+
jvmTarget = "1.8"
7168
}
7269
}
7370

71+
group = "com.liftric.code.artifact.repository"
72+
version =
73+
with(versioning.info) {
74+
if (branch == "HEAD" && dirty.not()) {
75+
tag
76+
} else {
77+
full
78+
}
79+
}
80+
7481
gradlePlugin {
82+
website.set("https://github.com/Liftric/code-artifact-repository-plugin")
83+
vcsUrl.set("https://github.com/Liftric/code-artifact-repository-plugin")
7584
plugins {
7685
create("CodeArtifactRepositoryPlugin") {
7786
id = "com.liftric.code-artifact-repository-plugin"
7887
displayName = "code-artifact-repository-plugin"
7988
description = "Apply AWS CodeArtifact repositories"
8089
implementationClass = "com.liftric.code.artifact.repository.CodeArtifactRepositoryPlugin"
90+
tags.set(listOf("aws", "codeartifact", "maven", "repository"))
8191
}
8292
}
8393
}
84-
85-
pluginBundle {
86-
website = "https://github.com/Liftric/code-artifact-repository-plugin"
87-
vcsUrl = "https://github.com/Liftric/code-artifact-repository-plugin"
88-
description = "Gradle plugin to apply AWS CodeArtifact repositories"
89-
tags = listOf("aws", "codeartifact", "maven", "repository")
90-
}

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
[versions]
2-
aws = "2.17.224"
3-
detekt = "1.20.0"
4-
junit = "4.13.2"
5-
kotlin = "1.7.0"
6-
ktlint-gradle = "10.3.0"
7-
plugin-publish = "1.0.0"
8-
version-catalog-update = "0.5.1"
9-
version-check = "0.42.0"
10-
versioning = "3.0.0"
2+
aws = "2.26.31"
3+
detekt = "1.23.6"
4+
kotlin = "2.0.10"
5+
ktlint-gradle = "12.1.1"
6+
plugin-publish = "1.2.1"
7+
version-catalog-update = "0.8.4"
8+
version-check = "0.51.0"
9+
versioning = "3.1.0"
1110

1211
[libraries]
1312
aws-codeartifact = { module = "software.amazon.awssdk:codeartifact", version.ref = "aws" }
1413
aws-ecs = { module = "software.amazon.awssdk:ecs", version.ref = "aws" }
1514
aws-sts = { module = "software.amazon.awssdk:sts", version.ref = "aws" }
16-
junit = { module = "junit:junit", version.ref = "junit" }
1715

1816
[plugins]
1917
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/kotlin/com/liftric/code/artifact/repository/CodeArtifact.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ abstract class CodeArtifact {
3131
AwsBasicCredentials.create(
3232
accessKeyId.get(),
3333
secretAccessKey.get(),
34-
)
34+
),
3535
).resolveCredentials()
3636
}
3737
} else {
@@ -55,7 +55,7 @@ abstract class CodeArtifact {
5555
AwsBasicCredentials.create(
5656
accessKeyId.get(),
5757
secretAccessKey.get(),
58-
)
58+
),
5959
).resolveCredentials()
6060
}
6161
} else {
@@ -83,7 +83,7 @@ abstract class CodeArtifact {
8383
internal fun repositoryEndpointResponse(
8484
domain: String,
8585
repository: String,
86-
format: String = "maven"
86+
format: String = "maven",
8787
): GetRepositoryEndpointResponse {
8888
return client.getRepositoryEndpoint {
8989
it.domain(domain)

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@ package com.liftric.code.artifact.repository
33
import org.gradle.api.plugins.ExtensionContainer
44

55
abstract class CodeArtifactRepositoryExtension(private val extensionContainer: ExtensionContainer) : CodeArtifact() {
6-
fun additional(name: String, block: CodeArtifact.() -> Unit) {
6+
fun additional(
7+
name: String,
8+
block: CodeArtifact.() -> Unit,
9+
) {
710
if (name.isEmpty()) error("Empty domain is not supported!")
8-
store[name] = extensionContainer.create(
9-
"${name}${CodeArtifactRepositoryPlugin.extensionName}",
10-
CodeArtifactRepositoryExtension::class.java,
11-
extensionContainer
12-
).apply {
13-
block.invoke(this)
14-
region.convention(this@CodeArtifactRepositoryExtension.region)
15-
profile.convention(this@CodeArtifactRepositoryExtension.profile)
16-
accessKeyId.convention(this@CodeArtifactRepositoryExtension.accessKeyId)
17-
secretAccessKey.convention(this@CodeArtifactRepositoryExtension.secretAccessKey)
18-
tokenExpiresIn.convention(this@CodeArtifactRepositoryExtension.tokenExpiresIn)
19-
}
11+
store[name] =
12+
extensionContainer.create(
13+
"${name}${CodeArtifactRepositoryPlugin.EXTENSION_NAME}",
14+
CodeArtifactRepositoryExtension::class.java,
15+
extensionContainer,
16+
).apply {
17+
block.invoke(this)
18+
region.convention(this@CodeArtifactRepositoryExtension.region)
19+
profile.convention(this@CodeArtifactRepositoryExtension.profile)
20+
accessKeyId.convention(this@CodeArtifactRepositoryExtension.accessKeyId)
21+
secretAccessKey.convention(this@CodeArtifactRepositoryExtension.secretAccessKey)
22+
tokenExpiresIn.convention(this@CodeArtifactRepositoryExtension.tokenExpiresIn)
23+
}
2024
}
2125

2226
companion object {

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

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,60 +17,68 @@ abstract class CodeArtifactRepositoryPlugin : Plugin<Any> {
1717
override fun apply(scope: Any) {
1818
when (scope) {
1919
is Settings -> {
20-
scope.extensions.create(extensionName, CodeArtifactRepositoryExtension::class.java, scope.extensions)
20+
scope.extensions.create(EXTENSION_NAME, CodeArtifactRepositoryExtension::class.java, scope.extensions)
2121
.also {
2222
CodeArtifactRepositoryExtension.store[""] = it
2323
}
2424
}
25+
2526
is Project -> {
26-
scope.extensions.create(extensionName, CodeArtifactRepositoryExtension::class.java, scope.extensions)
27+
scope.extensions.create(EXTENSION_NAME, CodeArtifactRepositoryExtension::class.java, scope.extensions)
2728
.also {
2829
CodeArtifactRepositoryExtension.store[""] = it
2930
}
3031
}
32+
3133
is Gradle -> {
3234
scope.beforeSettings {
33-
extensions.create(extensionName, CodeArtifactRepositoryExtension::class.java, extensions)
34-
.also {
35-
CodeArtifactRepositoryExtension.store[""] = it
36-
}
35+
extensions.create(EXTENSION_NAME, CodeArtifactRepositoryExtension::class.java, extensions).also {
36+
CodeArtifactRepositoryExtension.store[""] = it
37+
}
3738
}
3839
}
40+
3941
else -> {
4042
throw GradleException("Should only get applied on Settings or Project")
4143
}
4244
}
4345
}
4446

4547
companion object {
46-
const val extensionName = "CodeArtifactRepository"
48+
const val EXTENSION_NAME = "CodeArtifactRepository"
4749
}
4850
}
4951

5052
inline fun Settings.codeArtifactRepository(configure: CodeArtifactRepositoryExtension.() -> Unit) {
51-
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.extensionName).configure()
53+
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.EXTENSION_NAME).configure()
5254
}
5355

5456
inline fun Project.codeArtifactRepository(configure: CodeArtifactRepositoryExtension.() -> Unit) {
55-
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.extensionName).configure()
57+
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.EXTENSION_NAME).configure()
5658
}
5759

5860
inline fun Gradle.codeArtifactRepository(crossinline configure: CodeArtifactRepositoryExtension.() -> Unit) {
5961
settingsEvaluated {
60-
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.extensionName).configure()
62+
extensions.getByName<CodeArtifactRepositoryExtension>(CodeArtifactRepositoryPlugin.EXTENSION_NAME).configure()
6163
}
6264
}
6365

6466
/**
6567
* Use the default CodeArtifact config (and therefore extension)
6668
*/
67-
fun RepositoryHandler.codeArtifact(domain: String, repository: String): MavenArtifactRepository =
68-
codeArtifact("", domain, repository)
69+
fun RepositoryHandler.codeArtifact(
70+
domain: String,
71+
repository: String,
72+
): MavenArtifactRepository = codeArtifact("", domain, repository)
6973

7074
/**
7175
* Use CodeArtifact by additional name
7276
*/
73-
fun RepositoryHandler.codeArtifact(additionalName: String, domain: String, repository: String) = maven {
77+
fun RepositoryHandler.codeArtifact(
78+
additionalName: String,
79+
domain: String,
80+
repository: String,
81+
) = maven {
7482
CodeArtifactRepositoryExtension.store[additionalName]?.let {
7583
name = listOf(additionalName, domain, repository).joinToString("") { it.capitalized() }
7684
url = URI.create(it.repositoryEndpointResponse(domain, repository).repositoryEndpoint())
@@ -89,18 +97,25 @@ fun codeArtifactToken(domain: String): String = codeArtifactToken("", domain)
8997
/**
9098
* If you need the plain endpoint uri
9199
*/
92-
fun codeArtifactUri(domain: String, repository: String, format: String): URI =
93-
codeArtifactUri("", domain, repository, format)
100+
fun codeArtifactUri(
101+
domain: String,
102+
repository: String,
103+
format: String,
104+
): URI = codeArtifactUri("", domain, repository, format)
94105

95106
/**
96107
* If you need the plain token
97108
*
98109
* @param additionalName this is the name (prefix) of the codeArtifactRepository configuration. Use an empty string to use
99110
* the default extension
100111
*/
101-
fun codeArtifactToken(additionalName: String, domain: String): String {
102-
val settings = CodeArtifactRepositoryExtension.store[additionalName]
103-
?: throw GradleException("didn't find CodeArtifactRepositoryExtension with the name: $")
112+
fun codeArtifactToken(
113+
additionalName: String,
114+
domain: String,
115+
): String {
116+
val settings =
117+
CodeArtifactRepositoryExtension.store[additionalName]
118+
?: throw GradleException("didn't find CodeArtifactRepositoryExtension with the name: $")
104119
return settings.authorizationTokenResponse(domain).authorizationToken()
105120
}
106121

@@ -110,8 +125,14 @@ fun codeArtifactToken(additionalName: String, domain: String): String {
110125
* @param additionalName this is the name (prefix) of the codeArtifactRepository configuration. Use an empty string to use
111126
* the default extension
112127
*/
113-
fun codeArtifactUri(additionalName: String, domain: String, repository: String, format: String): URI {
114-
val settings = CodeArtifactRepositoryExtension.store[additionalName]
115-
?: throw GradleException("didn't find CodeArtifactRepositoryExtension with the name: $")
128+
fun codeArtifactUri(
129+
additionalName: String,
130+
domain: String,
131+
repository: String,
132+
format: String,
133+
): URI {
134+
val settings =
135+
CodeArtifactRepositoryExtension.store[additionalName]
136+
?: throw GradleException("didn't find CodeArtifactRepositoryExtension with the name: $")
116137
return settings.repositoryEndpointResponse(domain, repository, format).repositoryEndpoint().let { URI.create(it) }
117138
}

0 commit comments

Comments
 (0)