Skip to content

New approach to release deployment #79

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 1, 2019
Merged

New approach to release deployment #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import de.undercouch.gradle.tasks.download.Download
import org.gradle.api.tasks.testing.logging.TestExceptionFormat

val deployerJars by configurations.creating
val tag = System.getenv("TRAVIS_TAG")?.replaceFirst("^v".toRegex(), "")

group = "org.utplsql"
val mavenArtifactId = "java-api"
version = "3.1.7-SNAPSHOT"
val baseVersion = "3.1.7-SNAPSHOT"
// if build is on tag like 3.1.7 or v3.1.7 then use tag as version replacing leading "v"
version = if (tag != null && "^[0-9.]+$".toRegex().matches(tag)) tag else baseVersion

val coverageResourcesVersion = "1.0.1"
val ojdbcVersion = "12.2.0.1"
val junitVersion = "5.4.1"

val deployerJars by configurations.creating

plugins {
`java-library`
Expand All @@ -28,8 +33,8 @@ repositories {
url = uri("https://www.oracle.com/content/secure/maven/content")
credentials {
// you may set this properties using gradle.properties file in the root of the project or in your GRADLE_HOME
username = if (project.hasProperty("ORACLE_OTN_USER")) project.property("ORACLE_OTN_USER") as String? else System.getenv("ORACLE_OTN_USER")
password = if (project.hasProperty("ORACLE_OTN_PASSWORD")) project.property("ORACLE_OTN_PASSWORD") as String? else System.getenv("ORACLE_OTN_PASSWORD")
username = (project.findProperty("ORACLE_OTN_USER") as String?) ?: System.getenv("ORACLE_OTN_USER")
password = (project.findProperty("ORACLE_OTN_PASSWORD") as String?) ?: System.getenv("ORACLE_OTN_PASSWORD")
}
}
mavenCentral()
Expand All @@ -47,8 +52,10 @@ dependencies {
implementation("com.oracle.jdbc:orai18n:$ojdbcVersion")

// Use Jupiter test framework
testImplementation("org.junit.jupiter:junit-jupiter:5.4.0")
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
testImplementation("org.hamcrest:hamcrest:2.1")

// deployer for packagecloud
deployerJars("io.packagecloud.maven.wagon:maven-packagecloud-wagon:0.0.6")
}

Expand All @@ -66,9 +73,10 @@ tasks {
val intTest = create<Test>("intTest") {
dependsOn(test)
doFirst {
environment("DB_URL", System.getenv("DB_URL") ?: "localhost:1521/XE")
environment("DB_USER", System.getenv("DB_USER") ?: "app")
environment("DB_PASS", System.getenv("DB_PASS") ?: "app")
environment("DB_URL", (project.findProperty("DB_URL") as String?) ?: System.getenv("DB_URL")
?: "localhost:1521/XE")
environment("DB_USER", (project.findProperty("DB_USER") as String?) ?: System.getenv("DB_USER") ?: "app")
environment("DB_PASS", (project.findProperty("DB_PASS") as String?) ?: System.getenv("DB_PASS") ?: "app")
}
useJUnitPlatform()
include("**/*IT.class")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists