Skip to content

Commit 41545f3

Browse files
committed
refactor: extract flamingock-template-api and flamingock-general-util out to independent repos
1 parent 557ae6c commit 41545f3

Some content is hidden

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

45 files changed

+18
-2851
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -383,19 +383,6 @@ jobs:
383383
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
384384
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
385385

386-
general-util:
387-
needs: [ build ]
388-
uses: ./.github/workflows/module-release-graalvm.yml
389-
with:
390-
module: general-util
391-
secrets:
392-
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
393-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
394-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
395-
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
396-
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
397-
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
398-
399386
test-util:
400387
needs: [ build ]
401388
uses: ./.github/workflows/module-release-graalvm.yml
@@ -565,7 +552,6 @@ jobs:
565552
dynamodb-target-system,
566553
couchbase-external-system-api,
567554
couchbase-target-system,
568-
general-util,
569555
test-util,
570556
mongodb-util,
571557
mongodb-test-kit,

build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ allprojects {
1818
group = "io.flamingock"
1919
version = "1.2.0-beta.2"
2020

21+
extra["templateApiVersion"] = "1.3.0"
22+
extra["generalUtilVersion"] = "1.3.0"
23+
2124
repositories {
2225
mavenLocal()
2326
mavenCentral()

buildSrc/src/main/kotlin/flamingock.project-structure.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ val externalSystemProjects = setOf(
5050
)
5151

5252
val utilProjects = setOf(
53-
"general-util",
5453
"test-util",
5554
"mongodb-util",
5655
"dynamodb-util",

core/flamingock-core-api/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
val jacksonVersion = "2.16.0"
2-
val templateApiVersion = "1.0.0"
2+
val templateApiVersion: String by extra
3+
val generalUtilVersion: String by extra
34
dependencies {
45
api("io.flamingock:flamingock-template-api:${templateApiVersion}")
5-
implementation(project(":utils:general-util"))
6+
implementation("io.flamingock:flamingock-general-util:${generalUtilVersion}")
67
api("jakarta.annotation:jakarta.annotation-api:2.1.1")//todo can this be implementation?
78

89
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")

core/flamingock-core-commons/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
val jacksonVersion = "2.16.0"
2+
val generalUtilVersion: String by extra
23
dependencies {
34
api(project(":core:flamingock-core-api"))
4-
api(project(":utils:general-util"))//todo implementation
5+
api("io.flamingock:flamingock-general-util:${generalUtilVersion}")//todo implementation
56
api("jakarta.annotation:jakarta.annotation-api:2.1.1")//todo can this be implementation?
67

78
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")

core/flamingock-core/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
val jacksonVersion = "2.16.0"
2+
val generalUtilVersion: String by extra
23

34
dependencies {
45
api(project(":core:flamingock-core-commons"))
5-
api(project(":utils:general-util"))//todo implementation
6+
api("io.flamingock:flamingock-general-util:${generalUtilVersion}")//todo implementation
67

78
api("javax.inject:javax.inject:1")
89
api("org.javassist:javassist:3.30.2-GA")

core/flamingock-processor/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
val jacksonVersion = "2.16.0"
2+
val generalUtilVersion: String by extra
23
dependencies {
34
api(project(":core:flamingock-core-commons"))
4-
api(project(":utils:general-util"))//todo implementation
5+
api("io.flamingock:flamingock-general-util:${generalUtilVersion}")//todo implementation
56
api("org.yaml:snakeyaml:2.2")//todo implementation
67
api("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")//todo implementation
78
}

settings.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ project(":core:target-systems:couchbase-target-system").name = "couchbase-target
136136
//////////////////////////////////////
137137
// UTILS
138138
//////////////////////////////////////
139-
include("utils:general-util")
140-
project(":utils:general-util").name = "general-util"
141-
project(":utils:general-util").projectDir = file("utils/general-util")
142-
143139
include("utils:test-util")
144140
project(":utils:test-util").name = "test-util"
145141
project(":utils:test-util").projectDir = file("utils/test-util")

utils/dynamodb-test-kit/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
val generalUtilVersion: String by extra
12
dependencies {
23
implementation(project(":core:flamingock-core"))
34
implementation(project(":utils:dynamodb-util"))
4-
implementation(project(":utils:general-util"))
5+
implementation("io.flamingock:flamingock-general-util:${generalUtilVersion}")
56
implementation(project(":utils:test-util"))
67

78
compileOnly("software.amazon.awssdk:dynamodb-enhanced:2.25.29")

utils/dynamodb-util/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
val generalUtilVersion: String by extra
12
dependencies {
23
implementation(project(":core:flamingock-core"))
3-
implementation(project(":utils:general-util"))
4+
implementation("io.flamingock:flamingock-general-util:${generalUtilVersion}")
45

56
compileOnly("software.amazon.awssdk:dynamodb-enhanced:2.25.29")
67
}

0 commit comments

Comments
 (0)