Skip to content

Commit 8406bc9

Browse files
authored
Add missing sources jars (#875)
* Add missing sources jars * Move sources jar and docs jar declaration to publish plugin sho it cannot be forgotten * Bump version to 0.14.2
1 parent faa32f9 commit 8406bc9

File tree

16 files changed

+23
-46
lines changed

16 files changed

+23
-46
lines changed

.github/workflows/trigger_dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666
- run: |
6767
echo "Setup done"
6868
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
69-
godot-kotlin-jvm-version: "0.14.1-4.5.1"
69+
godot-kotlin-jvm-version: "0.14.2-4.5.1"
7070
godot-version: "4.5.1-stable"
71-
build-version: "0.14.1"
71+
build-version: "0.14.2"
7272
jvm-version: "17"
7373

7474
build-jvm:
@@ -110,4 +110,4 @@ jobs:
110110
with:
111111
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
112112
jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
113-
build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
113+
build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}

.github/workflows/trigger_on_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
- run: |
1515
echo "Setup done"
1616
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
17-
godot-kotlin-jvm-version: "0.14.1-4.5"
17+
godot-kotlin-jvm-version: "0.14.2-4.5"
1818
godot-version: "4.5.1-stable"
19-
build-version: "0.14.1"
19+
build-version: "0.14.2"
2020
jvm-version: "17"
2121

2222
build-jvm:

.github/workflows/trigger_on_push_master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- run: |
2020
echo "Setup done"
2121
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
22-
godot-kotlin-jvm-version: "0.14.1-4.5.1"
22+
godot-kotlin-jvm-version: "0.14.2-4.5.1"
2323
godot-version: "4.5.1-stable"
24-
build-version: "0.14.1"
24+
build-version: "0.14.2"
2525
jvm-version: "17"
2626

2727
build-jvm:
@@ -145,4 +145,4 @@ jobs:
145145
with:
146146
godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
147147
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
148-
build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
148+
build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}

.github/workflows/trigger_on_tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
- run: |
2727
echo "Setup done"
2828
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
29-
godot-kotlin-jvm-version: "0.14.1-4.5.1"
29+
godot-kotlin-jvm-version: "0.14.2-4.5.1"
3030
godot-version: "4.5.1-stable"
31-
build-version: "0.14.1"
31+
build-version: "0.14.2"
3232
jvm-version: "17"
3333

3434
build-jvm:

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ def can_build(env, platform):
22
return True
33

44
def configure(env):
5-
env.add_module_version_string("jvm.0.14.1")
5+
env.add_module_version_string("jvm.0.14.2")

docs/src/doc/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ While Kotlin and Godot supports a wide range of platforms, this module for the m
6464

6565
The module uses semantic versioning for its own versions but adds a suffix for the supported Godot version:
6666

67-
Full version: `0.14.1-4.5.1`
67+
Full version: `0.14.2-4.5.1`
6868

69-
Module Version: `0.14.1`
69+
Module Version: `0.14.2`
7070

7171
Supported Godot Version: `4.5.1`
7272

kt/build-logic/convention/src/main/kotlin/publish/PublishToMavenCentralPlugin.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import com.vanniktech.maven.publish.MavenPublishBasePlugin
55
import com.vanniktech.maven.publish.SonatypeHost
66
import org.gradle.api.Plugin
77
import org.gradle.api.Project
8+
import org.gradle.api.plugins.JavaPluginExtension
89
import org.gradle.api.publish.PublishingExtension
910
import org.gradle.api.publish.maven.MavenPublication
1011
import org.gradle.plugins.signing.Sign
12+
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
1113

1214
@Suppress("unused") // false positive
1315
class PublishToMavenCentralPlugin : Plugin<Project> {
@@ -21,6 +23,11 @@ class PublishToMavenCentralPlugin : Plugin<Project> {
2123

2224
val canSign = mavenCentralUser != null && mavenCentralPassword != null && gpgInMemoryKey != null && gpgPassword != null
2325

26+
target.extensions.getByType(JavaPluginExtension::class.java).apply {
27+
withSourcesJar()
28+
withJavadocJar()
29+
}
30+
2431
if (canSign) {
2532
target.logger.info("Will sign artifact for project \"${target.name}\" and setup publishing")
2633

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package godot.common
22

3-
const val GODOT_KOTLIN_VERSION = "0.14.1-4.5.1"
3+
const val GODOT_KOTLIN_VERSION = "0.14.2-4.5.1"

kt/godot-library/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ kotlin {
3030
jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
3131
}
3232

33-
java {
34-
withSourcesJar()
35-
withJavadocJar()
36-
}
37-
3833
dependencies {
3934
// added here as a transitive dependency so the user can use reflection
4035
// we need to add it here so reflection is available where the code is loaded (Bootstrap.kt) otherwise it will not work

kt/godot-library/godot-api-library/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ kotlin {
1818
jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
1919
}
2020

21-
java {
22-
withSourcesJar()
23-
withJavadocJar()
24-
}
25-
2621
dependencies {
2722
api("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
2823
implementation(project(":godot-internal-library"))

0 commit comments

Comments
 (0)