Skip to content

Commit

Permalink
Run formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
Cies authored and Cies committed Oct 2, 2024
1 parent 24286d7 commit eefd7f5
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 46 deletions.
16 changes: 12 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ defaultTasks 'clean', 'check', 'publishToMavenLocal'

subprojects {

group='io.github.replay-framework'
version=project.properties['revision'] ?: '2.6.3'
group = 'io.github.replay-framework'
version = project.properties['revision'] ?: '2.6.3'

apply plugin: 'java'
apply plugin: 'java-library'
Expand Down Expand Up @@ -72,7 +72,7 @@ subprojects {
testTask.systemProperties['file.encoding'] = 'UTF-8'
testTask.systemProperties['user.country'] = 'TR'
testTask.systemProperties['user.language'] = 'tr'
testTask.testLogging {exceptionFormat = 'full'}
testTask.testLogging { exceptionFormat = 'full' }
testTask.outputs.upToDateWhen { false }
}

Expand All @@ -86,5 +86,13 @@ subprojects {
}

googleJavaFormat {
toolVersion = '1.1'
toolVersion = '1.8'
exclude '.gradle/**/*.java'
}

// Needed to allow the googleJavaFormat Gradle plugin to select the right variant of Guava
configurations.configureEach {
attributes {
attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
}
}
20 changes: 10 additions & 10 deletions excel/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
dependencies {
implementation project(':framework')
testImplementation project(':framework').sourceSets.test.compileClasspath
api(libs.jxlsCore) {transitive = false}
api(libs.jxlsReader) {transitive = false}
implementation(libs.commonsJexl) {transitive = false}
api(libs.poi) {transitive = false}
api(libs.poiOoxml) {transitive = false}
api(libs.poiOoxmlSchemas) {transitive = false}
api(libs.xmlBeans) {transitive = false}
implementation(libs.commonsDigester) {transitive = false}
implementation(libs.commonsCollections4) {transitive = false}

api(libs.jxlsCore) { transitive = false }
api(libs.jxlsReader) { transitive = false }
implementation(libs.commonsJexl) { transitive = false }
api(libs.poi) { transitive = false }
api(libs.poiOoxml) { transitive = false }
api(libs.poiOoxmlSchemas) { transitive = false }
api(libs.xmlBeans) { transitive = false }
implementation(libs.commonsDigester) { transitive = false }
implementation(libs.commonsCollections4) { transitive = false }
}

apply from: rootProject.file('gradle/deploy.gradle')
14 changes: 7 additions & 7 deletions framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ dependencies {
implementation(libs.asyncHttpClient) {
exclude group: 'io.netty'
}
api(libs.guava) {transitive = false}
api(libs.commonsBeanutils) {transitive = false}
api(libs.commonsCodec) {transitive = false}
api(libs.commonsEmail) {transitive = false}
api(libs.guava) { transitive = false }
api(libs.commonsBeanutils) { transitive = false }
api(libs.commonsCodec) { transitive = false }
api(libs.commonsEmail) { transitive = false }
api(libs.commonsFileUpload)
api(libs.commonsIo)
implementation(libs.commonsLang3)
Expand All @@ -25,7 +25,7 @@ dependencies {
// Hibernate 6.2-6.5 are only compatible with Jakarta Persistence 3.1
api(libs.jakartaPersistence)
api(libs.hibernateCommonsAnnotations)
implementation(libs.hibernateJCache) {transitive = false}
implementation(libs.hibernateJCache) { transitive = false }
api(libs.slf4j)
api(libs.slf4jReload4j)
api(libs.julToSlf4j)
Expand All @@ -37,8 +37,8 @@ task generateReplayVersion(type: Exec) {
standardOutput out

doFirst {
standardOutput new FileOutputStream("${buildDir}/classes/java/main/play/version")
standardOutput.write((project.version + '-').getBytes('UTF-8'))
standardOutput new FileOutputStream("${buildDir}/classes/java/main/play/version")
standardOutput.write((project.version + '-').getBytes('UTF-8'))
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/deploy.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ publishing {
maven {
name 'Maven'
url project.version.endsWith("-SNAPSHOT") ?
'https://s01.oss.sonatype.org/content/repositories/snapshots/' :
'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
'https://s01.oss.sonatype.org/content/repositories/snapshots/' :
'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
credentials {
username "$sonatypeUsername"
password "$sonatypePassword"
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ kotlinStdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8" }

# :replay-tests:liquibase
h2 = { group = "com.h2database", name = "h2", version = "2.3.232" }
liquibaseCore = { group = "org.liquibase", name ="liquibase-core", version = "4.29.2" }
liquibaseCore = { group = "org.liquibase", name = "liquibase-core", version = "4.29.2" }


# [bundles] # Only useful for sharing sets of dependencies between (sub)projects
Expand Down
8 changes: 4 additions & 4 deletions javanet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ dependencies {
implementation project(':framework')
testImplementation project(':framework').sourceSets.test.compileClasspath
implementation(libs.commonsText)

// We use only few small jars from Netty project to parse http cookies
implementation(libs.netty4Codec) {transitive = false}
implementation(libs.netty4CodecHttp) {transitive = false}
implementation(libs.netty4Common) {transitive = false}
implementation(libs.netty4Codec) { transitive = false }
implementation(libs.netty4CodecHttp) { transitive = false }
implementation(libs.netty4Common) { transitive = false }
}

apply from: rootProject.file('gradle/deploy.gradle')
2 changes: 1 addition & 1 deletion liquibase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies {
implementation project(':framework')
testImplementation project(':framework').sourceSets.test.compileClasspath

implementation(libs.liquibaseCore) {transitive = false}
implementation(libs.liquibaseCore) { transitive = false }
}

apply from: rootProject.file('gradle/deploy.gradle')
4 changes: 2 additions & 2 deletions pdf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies {
implementation(libs.flyingSaucerPdf)

implementation(libs.shaniParser)
api(libs.yahp) {transitive = false}
thirdParty(libs.yahpInternal) {transitive = false}
api(libs.yahp) { transitive = false }
thirdParty(libs.yahpInternal) { transitive = false }
}

task extractThirdPartyJars(type: Sync) {
Expand Down
2 changes: 1 addition & 1 deletion replay-tests/criminals/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
implementation(libs.fluentHc)

testImplementation(libs.pdfTest)
testImplementation(libs.subethasmtp) {transitive = false}
testImplementation(libs.subethasmtp) { transitive = false }
testImplementation(libs.wiremock) {
exclude group: 'org.eclipse.jetty', module: 'jetty-client'
}
Expand Down
2 changes: 1 addition & 1 deletion replay-tests/helloworld-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.kotlinJvm)
}
dependencies {
implementation(libs.guava) {transitive = false}
implementation(libs.guava) { transitive = false }
implementation(libs.kotlinStdlib)
implementation project(':pdf')
testImplementation(libs.pdfTest)
Expand Down
2 changes: 1 addition & 1 deletion replay-tests/helloworld/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation(libs.guava) {transitive = false}
implementation(libs.guava) { transitive = false }
implementation project(':pdf')
testImplementation(libs.assertjCore)
testImplementation(libs.pdfTest)
Expand Down
25 changes: 13 additions & 12 deletions replay-tests/replay-tests.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
sourceSets {
main {
java {srcDir "app"}
resources {srcDir "app"}
java { srcDir "app" }
resources { srcDir "app" }
resources {
srcDir 'conf'
include '**/*'
}
}
test {
java {srcDir "test"}
java { srcDir "test" }
}
}

Expand Down Expand Up @@ -50,28 +50,29 @@ tasks.register('uitest') {

tasks.register('uitest-netty3', Test) {
include 'ui/**/*'
outputs.upToDateWhen {false}
outputs.upToDateWhen { false }
classpath = configurations.netty3TestClasspath + classpath
}

tasks.register('uitest-netty4', Test) {
include 'ui/**/*'
exclude 'ui/hello/RenderStaticFilesSpec*' // TODO: clarify why `replay-netty4` fails on static files
outputs.upToDateWhen {false}
exclude 'ui/hello/RenderStaticFilesSpec*'
// TODO: clarify why `replay-netty4` fails on static files
outputs.upToDateWhen { false }
classpath = configurations.netty4TestClasspath + classpath
}

tasks.register('uitest-javanet', Test) {
include 'ui/**/*'
outputs.upToDateWhen {false}
outputs.upToDateWhen { false }
classpath = configurations.javanetTestClasspath + classpath
}

tasks.withType(Test).configureEach {
System.properties.stringPropertyNames()
.findAll { it.startsWith("selenide.") }
.forEach {
println " set ${it} to ${System.getProperty(it)}"
systemProperties[it] = System.getProperty(it)
}
.findAll { it.startsWith("selenide.") }
.forEach {
println " set ${it} to ${System.getProperty(it)}"
systemProperties[it] = System.getProperty(it)
}
}

0 comments on commit eefd7f5

Please sign in to comment.