Skip to content

Commit 6277cb6

Browse files
authored
Merge pull request #104 from compose-fluent/change-group
Change package to `io.github.jpy.wangposefluent`
2 parents 5003692 + a90537a commit 6277cb6

File tree

7,696 files changed

+248327
-248235
lines changed

Some content is hidden

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

7,696 files changed

+248327
-248235
lines changed

.github/workflows/gradle-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
- name: Publish to Maven Central
3838
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
3939
with:
40-
arguments: publish
40+
arguments: publishToMavenCentral --no-configuration-cache
4141
env:
42-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
43-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
44-
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
45-
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
46-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
42+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
43+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
44+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }}
45+
ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }}
46+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }}

.github/workflows/multiplatform_snapshot_build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ jobs:
7979
if: ${{ github.event_name == 'push' && matrix.type == 'PublishLibrary' }}
8080
run: |
8181
./gradlew publishToMavenLocal
82-
./gradlew publish
82+
./gradlew publishToMavenCentral --no-configuration-cache
8383
env:
84-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
85-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
86-
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
87-
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
88-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
84+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
85+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
86+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }}
87+
ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }}
88+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
8989

9090
- name: Upload Library Artifact
9191
if: ${{ github.event_name == 'push' && matrix.type == 'PublishLibrary' }}

build-plugin/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ repositories {
99

1010
dependencies {
1111
implementation(gradleApi())
12+
1213
implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
14+
implementation(
15+
"com.vanniktech.maven.publish",
16+
"com.vanniktech.maven.publish.gradle.plugin",
17+
libs.versions.mavenPublish.get()
18+
)
1319
}
1420

1521
kotlin {
@@ -23,8 +29,8 @@ kotlin {
2329
gradlePlugin {
2430
plugins {
2531
create("BuildPlugin") {
26-
id = "com.konyaco.fluent.plugin.build"
27-
implementationClass = "com.konyaco.fluent.plugin.build.BuildPlugin"
32+
id = "io.github.jpy.wangposefluent.plugin.build"
33+
implementationClass = "io.github.jpy.wangposefluent.plugin.build.BuildPlugin"
2834
}
2935
}
3036
}

build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildPlugin.kt

Lines changed: 0 additions & 161 deletions
This file was deleted.

build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildConfig.kt renamed to build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.konyaco.fluent.plugin.build
1+
package io.github.jpy.wangposefluent.plugin.build
22

33
import org.gradle.api.JavaVersion
44

55
object BuildConfig {
66

7-
const val group = "com.konyaco"
7+
const val group = "io.github.jpy.wangpose-fluent"
88

9-
const val packageName = "$group.fluent"
9+
const val packageName = "io.github.jpy.wangposefluent"
1010

1111
internal const val snapshotLibraryVersion = "0.1.0-SNAPSHOT"
1212

@@ -22,7 +22,7 @@ object BuildConfig {
2222
internal set
2323

2424
object Android {
25-
const val compileSdkVersion = 34
25+
const val compileSdkVersion = 35
2626

2727
const val minSdkVersion = 24
2828
}

build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildExtension.kt renamed to build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.konyaco.fluent.plugin.build
1+
package io.github.jpy.wangposefluent.plugin.build
22

33
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
44
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

0 commit comments

Comments
 (0)