Skip to content

Commit ad69eb6

Browse files
committed
Publish version 0.2 awaiting approval
1 parent aa79c86 commit ad69eb6

File tree

23 files changed

+93
-100
lines changed

23 files changed

+93
-100
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ max_line_length = 80
1414
[*.{kt,kts}]
1515
indent_size = 4
1616
max_line_length = 100
17+
ktlint_standard_trailing-comma-on-call-site = disabled
18+
ktlint_standard_trailing-comma-on-declaration-site = disabled

buildSrc/src/Releases.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const val DEVELOPER_ID = "hendraanggrian"
22
const val DEVELOPER_NAME = "Hendra Anggrian"
33
const val DEVELOPER_URL = "https://github.com/$DEVELOPER_ID/"
44

5-
const val RELEASE_GROUP = "com.hendraanggrian"
5+
const val RELEASE_GROUP = "com.hendraanggrian.packaging"
66
const val RELEASE_ARTIFACT = "packaging-gradle-plugin"
77
const val RELEASE_VERSION = "0.2"
88
const val RELEASE_DESCRIPTION = "Start making native distributions for your JAR"

gradle/libs.versions.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
[versions]
22
jdk = "17"
3-
kotlin = "1.7.20"
3+
kotlin = "1.8.10"
44
ktor = "1.6.7"
5-
gradle-kotlin-dsl = "3.2.3" # hotfix: Gradle API mismatch
65

76
[plugins]
87
dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
98
kotlinx-kover = "org.jetbrains.kotlinx.kover:0.6.1"
109
gradle-publish = "com.gradle.plugin-publish:1.1.0"
11-
git-publish = "org.ajoberstar.git-publish:3.0.1"
10+
git-publish = "org.ajoberstar.git-publish:4.1.1"
1211
pages = "com.hendraanggrian.pages:0.1"
1312

1413
[libraries]
1514
# lint
16-
ktlint = "com.pinterest:ktlint:0.47.1"
17-
rulebook-ktlint = "com.hendraanggrian.rulebook:rulebook-ktlint:0.1"
15+
ktlint = "com.pinterest:ktlint:0.48.2"
16+
rulebook-ktlint = "com.hendraanggrian.rulebook:rulebook-ktlint:0.2"
1817
# main
1918
kotlinx-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
20-
osdetector = "com.google.gradle:osdetector-gradle-plugin:1.7.0"
19+
osdetector = "com.google.gradle:osdetector-gradle-plugin:1.7.2"
2120
# test
2221
truth = "com.google.truth:truth:1.1.3"

gradle/wrapper/gradle-wrapper.jar

502 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
plugins {
2-
`java-gradle-plugin`
3-
`kotlin-dsl` version libs.versions.gradle.kotlin.dsl
42
kotlin("jvm") version libs.versions.kotlin
53
alias(libs.plugins.dokka)
64
alias(libs.plugins.gradle.publish)
75
}
86

7+
kotlin.jvmToolchain(libs.versions.jdk.get().toInt())
8+
99
gradlePlugin {
10+
website.set(RELEASE_URL)
11+
vcsUrl.set("$RELEASE_URL.git")
1012
plugins.register("packagingPlugin") {
11-
id = "$RELEASE_GROUP.packaging"
12-
implementationClass = "$id.PackagingPlugin"
13+
id = RELEASE_GROUP
1314
displayName = "Packaging Plugin"
1415
description = RELEASE_DESCRIPTION
16+
tags.set(listOf("packaging", "jpackage", "native", "installer", "bundle"))
17+
implementationClass = "$RELEASE_GROUP.PackagingPlugin"
1518
}
1619
testSourceSets(sourceSets.test.get())
1720
}
1821

19-
kotlin.jvmToolchain(libs.versions.jdk.get().toInt())
20-
21-
pluginBundle {
22-
website = RELEASE_URL
23-
vcsUrl = "$RELEASE_URL.git"
24-
description = RELEASE_DESCRIPTION
25-
tags = listOf("packaging", "jpackage", "native", "installer", "bundle")
26-
}
27-
2822
dependencies {
2923
ktlint(libs.ktlint, ::configureKtlint)
3024
ktlint(libs.rulebook.ktlint)
25+
compileOnly(kotlin("gradle-plugin-api"))
26+
implementation(gradleKotlinDsl())
3127
implementation(libs.osdetector)
3228
testImplementation(gradleTestKit())
3329
testImplementation(kotlin("test-junit", libs.versions.kotlin.get()))

packaging/src/main/kotlin/com/hendraanggrian/packaging/Internals.kt renamed to packaging-gradle-plugin/src/main/kotlin/com/hendraanggrian/packaging/Internals.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ internal fun denormalizeArch(value: String): String = when {
3636

3737
internal abstract class PlatformOptionsImpl(objects: ObjectFactory, defaultPackSpec: PackSpec) :
3838
PackSpec {
39+
3940
//region Generic Options
4041
override val appVersion: Property<String> = objects.property<String>()
4142
.convention(defaultPackSpec.appVersion)

packaging/src/main/kotlin/com/hendraanggrian/packaging/LinuxOptions.kt renamed to packaging-gradle-plugin/src/main/kotlin/com/hendraanggrian/packaging/LinuxOptions.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.hendraanggrian.packaging
33
import org.gradle.api.model.ObjectFactory
44

55
/**
6-
* Platform-specific options than can be configured using [PackagingExtension.linux]. This [PackSpec] will also inherit
7-
* configuration from extension.
6+
* Platform-specific options than can be configured using [PackagingExtension.linux].
7+
* This [PackSpec] will also inherit configuration from extension.
88
*/
99
interface LinuxOptions : PackSpec {
1010
//region Platform dependent options for creating the application package
@@ -36,6 +36,7 @@ interface LinuxOptions : PackSpec {
3636

3737
internal class LinuxOptionsImpl(objects: ObjectFactory, defaultPackSpec: PackSpec) :
3838
PlatformOptionsImpl(objects, defaultPackSpec), LinuxOptions {
39+
3940
//region Platform dependent options for creating the application package
4041
override var packageName: String? = null
4142
override var debMaintainer: String? = null

packaging/src/main/kotlin/com/hendraanggrian/packaging/MacOptions.kt renamed to packaging-gradle-plugin/src/main/kotlin/com/hendraanggrian/packaging/MacOptions.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.gradle.api.model.ObjectFactory
44
import java.io.File
55

66
/**
7-
* Platform-specific options than can be configured using [PackagingExtension.mac]. This [PackSpec] will also inherit
8-
* configuration from extension.
7+
* Platform-specific options than can be configured using [PackagingExtension.mac].
8+
* This [PackSpec] will also inherit configuration from extension.
99
*/
1010
interface MacOptions : PackSpec {
1111
//region Platform dependent option for creating the application launcher
@@ -16,8 +16,8 @@ interface MacOptions : PackSpec {
1616
var packageName: String?
1717

1818
/**
19-
* When signing the application bundle, this value is prefixed to all components that need to be signed that don't
20-
* have an existing bundle identifier.
19+
* When signing the application bundle, this value is prefixed to all components that need to be
20+
* signed that don't have an existing bundle identifier.
2121
*/
2222
var bundleSigningPrefix: String?
2323

@@ -34,6 +34,7 @@ interface MacOptions : PackSpec {
3434

3535
internal class MacOptionsImpl(objects: ObjectFactory, defaultPackSpec: PackSpec) :
3636
PlatformOptionsImpl(objects, defaultPackSpec), MacOptions {
37+
3738
//region Platform dependent option for creating the application launcher
3839
override var packageIdentifier: String? = null
3940
override var packageName: String? = null

0 commit comments

Comments
 (0)