Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated to th2 gradle plugin and Kotlin DSL #18

Merged
merged 12 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ jobs:
uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
with:
multiproject: true
secrets:
nvd-api-key: ${{ secrets.NVD_APIKEY }}
publish-docker:
name: Build and publish docker image
if: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
with:
multiproject: true
secrets:
nvd-api-key: ${{ secrets.NVD_APIKEY }}
publish-docker:
name: Build docker image
needs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ jobs:
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}

owasp-scan:
needs:
- build-and-publish-core-java
uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
with:
multiproject: true

secrets:
nvd-api-key: ${{ secrets.NVD_APIKEY }}
publish-docker:
name: Build and publish docker image
needs:
Expand Down
68 changes: 0 additions & 68 deletions app/build.gradle

This file was deleted.

33 changes: 33 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
plugins {
id("application")
id("com.exactpro.th2.gradle.component")
}

configurations.all {
resolutionStrategy.cacheChangingModulesFor(0, "seconds")
resolutionStrategy.cacheDynamicVersionsFor(0, "seconds")
}

dependencies {
implementation(project(":read-db-core"))

//region Drivers
runtimeOnly("org.postgresql:postgresql:42.6.0") {
because("prostresql support")
}
runtimeOnly("com.mysql:mysql-connector-j:8.1.0") {
because("mysql support")
}
runtimeOnly("com.oracle.database.jdbc:ojdbc11:23.2.0.0") {
because("oracle support")
}
runtimeOnly("com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre11") {
because("mssql support")
}
//endregion
}

application {
applicationName = "service"
mainClass.set("com.exactpro.th2.read.db.bootstrap.Main")
}
63 changes: 0 additions & 63 deletions build.gradle

This file was deleted.

17 changes: 17 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
plugins {
id("com.exactpro.th2.gradle.base") version "0.0.4"
id("com.exactpro.th2.gradle.publish") version "0.0.4"

kotlin("jvm") version "1.8.22" apply false
id("com.exactpro.th2.gradle.grpc") version "0.0.4" apply false
id("com.exactpro.th2.gradle.component") version "0.0.4" apply false
}

allprojects {
group = "com.exactpro.th2"
version = project.findProperty("release_version") as String
val suffix = project.findProperty("version_suffix") as String
if (suffix.isNotEmpty()) {
version = "$version-$suffix"
}
}
10 changes: 0 additions & 10 deletions common.gradle

This file was deleted.

135 changes: 0 additions & 135 deletions core/build.gradle

This file was deleted.

Loading
Loading