Skip to content

Commit 730ff85

Browse files
LouisCADLouisCAD
authored
Merge pull request #712 from Splitties/main
Prepare for release 0.60.4
2 parents f468795 + 51bafcd commit 730ff85

File tree

72 files changed

+587
-505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+587
-505
lines changed

‎.github/workflows/check-build.yml

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ on:
8484
- '!docs/**'
8585
jobs:
8686
check-all:
87+
env:
88+
GPG_key_id: ${{ secrets.GPG_KEY_ID }}
89+
GPG_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
90+
GPG_private_password: ${{ secrets.GPG_PRIVATE_PASSWORD }}
8791
runs-on: ${{ github.event.inputs.run-on || 'ubuntu-latest' }}
8892
steps:
8993
- name: "Enable long paths for git Windows"

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change log for refreshVersions
22

3+
## Version 0.60.4 (2024-01-31)
4+
5+
### Potentially breaking change
6+
7+
We now support only Gradle 8+. Use Gradle 8+ or stick to version 0.60.3 if you can't yet.
8+
9+
### Bug fix
10+
11+
Update the priority of artifact version key rules so that the longest match takes precedence, rather than the final key length.
12+
That should fix the keys of `androidx.wear.compose` libraries.
13+
14+
315
## Version 0.60.3 (2023-09-27)
416

517
### Bug fix

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// settings.gradle(.kts)
2727
plugins {
2828
// See https://splitties.github.io/refreshVersions
29-
id("de.fayard.refreshVersions") version "0.60.3"
29+
id("de.fayard.refreshVersions") version "0.60.4"
3030
}
3131

3232
refreshVersions { // Optional: configure the plugin

‎docs/dependency-notations.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2401,31 +2401,31 @@ Hover 🐁 on a dependency notation to see its `Triple(KotlinName, MavenCoordina
24012401
24022402
<tr><td><b>AndroidX.wear.compose</b></td><td>
24032403
<span
2404-
title="AndroidX.wear.compose.foundation&#10;androidx.wear.compose:compose-foundation:_&#10;version.androidx.wear.compose.compose-foundation"
2404+
title="AndroidX.wear.compose.foundation&#10;androidx.wear.compose:compose-foundation:_&#10;version.androidx.wear.compose"
24052405
style="text-decoration: underline;">
24062406
foundation
24072407
</span>
24082408
-
24092409
<span
2410-
title="AndroidX.wear.compose.material3&#10;androidx.wear.compose:compose-material3:_&#10;version.androidx.wear.compose.compose-material3"
2410+
title="AndroidX.wear.compose.material3&#10;androidx.wear.compose:compose-material3:_&#10;version.androidx.wear.compose"
24112411
style="text-decoration: underline;">
24122412
material3
24132413
</span>
24142414
-
24152415
<span
2416-
title="AndroidX.wear.compose.material&#10;androidx.wear.compose:compose-material:_&#10;version.androidx.wear.compose.compose-material"
2416+
title="AndroidX.wear.compose.material&#10;androidx.wear.compose:compose-material:_&#10;version.androidx.wear.compose"
24172417
style="text-decoration: underline;">
24182418
material
24192419
</span>
24202420
-
24212421
<span
2422-
title="AndroidX.wear.compose.navigation&#10;androidx.wear.compose:compose-navigation:_&#10;version.androidx.wear.compose.compose-navigation"
2422+
title="AndroidX.wear.compose.navigation&#10;androidx.wear.compose:compose-navigation:_&#10;version.androidx.wear.compose"
24232423
style="text-decoration: underline;">
24242424
navigation
24252425
</span>
24262426
-
24272427
<span
2428-
title="AndroidX.wear.compose.uiTooling&#10;androidx.wear.compose:compose-ui-tooling:_&#10;version.androidx.wear.compose.compose-ui-tooling"
2428+
title="AndroidX.wear.compose.uiTooling&#10;androidx.wear.compose:compose-ui-tooling:_&#10;version.androidx.wear.compose"
24292429
style="text-decoration: underline;">
24302430
uiTooling
24312431
</span>

‎docs/requirements.txt

+34-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
1-
click==8.1.3
1+
mkdocs-material==9.5.6
2+
3+
# Dependencies of mkdocs-material:
4+
Markdown==3.5.2
5+
pymdown-extensions==10.7
6+
regex==2023.12.25
7+
Babel==2.14.0
8+
Jinja2==3.1.3
9+
mkdocs==1.5.3
10+
requests==2.31.0
11+
Pygments==2.17.2
12+
colorama==0.4.6
13+
paginate==0.5.6
14+
mkdocs-material-extensions==1.3.1
15+
16+
# A plugin:
17+
18+
mkdocs-markdownextradata-plugin==0.2.5
19+
20+
# Transitive dependencies
21+
22+
MarkupSafe==2.1.4
23+
certifi==2023.11.17
24+
charset-normalizer==3.3.2
25+
click==8.1.7
226
ghp-import==2.1.0
3-
importlib-metadata==4.11.4
4-
Jinja2==3.1.2
5-
Markdown==3.3.7
6-
MarkupSafe==2.1.1
27+
idna==3.6
28+
importlib-metadata==7.0.1
729
mergedeep==1.3.4
8-
mkdocs==1.3.0
9-
mkdocs-markdownextradata-plugin==0.2.5
10-
mkdocs-material==8.2.16
11-
mkdocs-material-extensions==1.0.3
12-
packaging==21.3
13-
Pygments==2.12.0
14-
pymdown-extensions==9.4
15-
pyparsing==3.0.9
30+
packaging==23.2
31+
pathspec==0.12.1
32+
platformdirs==4.1.0
1633
python-dateutil==2.8.2
17-
PyYAML==6.0
34+
PyYAML==6.0.1
1835
pyyaml_env_tag==0.1
19-
six==1.16.0
20-
watchdog==2.1.8
21-
zipp==3.8.0
36+
urllib3==2.2.0
37+
watchdog==3.0.0
38+
zipp==3.17.0

‎docs/setup.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ This guide will help you set up refreshVersions in a Gradle project.
44

55
## Update Gradle (if needed)
66

7-
Gradle 6.8+ is required because this plugin relies on Kotlin 1.4.
7+
Gradle 8+ is required because this plugin relies on Kotlin 1.8.
8+
That said, the version 0.60.3 of refreshVersions supports Gradle 6.8 to 7.x, in case you need to upgrade Gradle later.
89

910
Updating Gradle is anyway usually a good idea. You get fewer bugs, more
1011
features, and faster builds.

‎mkdocs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ extra:
2020
gradlePluginPortal: https://plugins.gradle.org/plugin/de.fayard.refreshVersions
2121
slack: https://app.slack.com/client/T09229ZC6/CP5659EL9
2222
version:
23-
gradle: 8.4
24-
refreshVersions: '0.60.3'
25-
snapshot: '0.60.4-SNAPSHOT'
23+
gradle: 8.5
24+
refreshVersions: '0.60.4'
25+
snapshot: '0.60.5-SNAPSHOT'
2626
keyboard_shortcuts:
2727
find_actions: <kbd>ctrl</kbd>/<kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>A</kbd>
2828

29-
copyright: 'Copyright &copy; 2020-2023 jmfayard - Louis CAD'
29+
copyright: 'Copyright &copy; 2020-2024 jmfayard - Louis CAD'
3030

3131
theme:
3232
name: 'material'

‎plugins/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
allprojects {
2-
repositories {
3-
mavenCentral()
4-
}
1+
plugins {
2+
// Defined in convention-plugins (includedBuild).
3+
// Added here to see updates in versions.properties.
4+
id("com.gradle.plugin-publish") apply false
55
}

‎plugins/buildSrc/build.gradle.kts

-11
This file was deleted.

‎plugins/buildSrc/src/main/kotlin/Property.kt

-5
This file was deleted.

‎plugins/buildSrcLibs/build.gradle.kts

+9-36
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
22

33
plugins {
4-
id("com.gradle.plugin-publish")
5-
`java-gradle-plugin`
6-
`maven-publish`
7-
signing
4+
id("gradle-plugin")
85
`kotlin-dsl`
96
}
107

@@ -15,30 +12,12 @@ gradlePlugin {
1512
displayName = "Dependency notation generator & updates"
1613
description = "Generates dependency notations constants in buildSrc and " +
1714
"updates the versions with gradle refreshVersions"
15+
tags = listOf("dependencies", "versions", "buildSrc", "kotlin", "kotlin-dsl")
1816
implementationClass = "de.fayard.buildSrcLibs.BuildSrcLibsPlugin"
1917
}
2018
}
2119
}
2220

23-
pluginBundle {
24-
website = "https://jmfayard.github.io/refreshVersions"
25-
vcsUrl = "https://github.com/jmfayard/refreshVersions"
26-
tags = listOf("dependencies", "versions", "buildSrc", "kotlin", "kotlin-dsl")
27-
}
28-
29-
signing {
30-
useInMemoryPgpKeys(
31-
propertyOrEnvOrNull("GPG_key_id"),
32-
propertyOrEnvOrNull("GPG_private_key") ?: return@signing,
33-
propertyOrEnv("GPG_private_password")
34-
)
35-
sign(publishing.publications)
36-
}
37-
38-
publishing {
39-
setupAllPublications(project)
40-
}
41-
4221
dependencies {
4322

4423
api(project(":refreshVersions-core"))
@@ -60,20 +39,14 @@ dependencies {
6039
}
6140

6241

63-
tasks.withType<KotlinCompile>().configureEach {
64-
kotlinOptions.jvmTarget = "1.8"
65-
kotlinOptions.freeCompilerArgs += listOf(
66-
"-Xopt-in=kotlin.RequiresOptIn",
67-
"-Xopt-in=de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi"
68-
)
42+
kotlin {
43+
jvmToolchain(8)
44+
compilerOptions {
45+
apiVersion = KotlinVersion.KOTLIN_1_8 // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
46+
freeCompilerArgs.add("-opt-in=de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi")
47+
}
6948
}
7049

7150
tasks.withType<Test>().configureEach {
7251
useJUnitPlatform()
7352
}
74-
75-
java {
76-
sourceCompatibility = JavaVersion.VERSION_1_8
77-
targetCompatibility = JavaVersion.VERSION_1_8
78-
withSourcesJar()
79-
}

‎plugins/convention-plugins/build.gradle.kts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
6+
7+
dependencies {
8+
implementation(plugin(id = "com.gradle.plugin-publish", version = "_"))
9+
}

‎plugins/convention-plugins/settings.gradle.kts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id("de.fayard.refreshVersions") version "0.60.3"
3+
}
4+
5+
dependencyResolutionManagement {
6+
@Suppress("UnstableApiUsage")
7+
repositories {
8+
mavenCentral()
9+
gradlePluginPortal()
10+
}
11+
}
12+
13+
refreshVersions {
14+
versionsPropertiesFile = rootDir.parentFile.resolve("versions.properties")
15+
}

‎plugins/buildSrc/src/main/kotlin/PropertyOrEnv.kt ‎plugins/convention-plugins/src/main/kotlin/PropertyOrEnv.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import org.gradle.api.Project
22

3-
fun Project.propertyOrEnv(key: String): String {
3+
internal fun Project.propertyOrEnv(key: String): String {
44
return findProperty(key) as String?
55
?: System.getenv(key)
66
?: error("Didn't find any value for the key \"$key\" in Project properties or environment variables.")
77
}
88

9-
fun Project.propertyOrEnvOrNull(key: String): String? {
9+
internal fun Project.propertyOrEnvOrNull(key: String): String? {
1010
return findProperty(key) as String? ?: System.getenv(key)
1111
}

‎plugins/convention-plugins/src/main/kotlin/gradle-plugin.gradle.kts

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
plugins {
2+
id("com.gradle.plugin-publish")
3+
signing
4+
}
5+
6+
signing {
7+
useInMemoryPgpKeys(
8+
propertyOrEnvOrNull("GPG_key_id"),
9+
propertyOrEnvOrNull("GPG_private_key") ?: return@signing,
10+
propertyOrEnv("GPG_private_password")
11+
)
12+
sign(publishing.publications)
13+
}
14+
15+
gradlePlugin {
16+
website = Publishing.siteUrl
17+
vcsUrl = Publishing.repoUrl
18+
}
19+
20+
publishing {
21+
setupAllPublications(project)
22+
}

0 commit comments

Comments
 (0)