Skip to content

Commit

Permalink
Define dependency versions per app
Browse files Browse the repository at this point in the history
  • Loading branch information
gcatanese committed Sep 12, 2024
1 parent ca19329 commit e12b230
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 109 deletions.
21 changes: 13 additions & 8 deletions checkout-example-advanced/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'
}
Expand All @@ -12,18 +12,23 @@ sourceCompatibility = 17
targetCompatibility = 17

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

testImplementation(libs.bundles.spring.test){
exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
developmentOnly 'org.springframework.boot:spring-boot-devtools'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

}

test {
useJUnitPlatform()
useJUnitPlatform()
}
7 changes: 0 additions & 7 deletions checkout-example-advanced/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
rootProject.name = 'adyen-java-spring-online-payments-checkout-advanced'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
16 changes: 10 additions & 6 deletions checkout-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'
}
Expand All @@ -16,11 +16,15 @@ repositories {
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

testImplementation(libs.bundles.spring.test){
exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
developmentOnly 'org.springframework.boot:spring-boot-devtools'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

}
Expand Down
8 changes: 0 additions & 8 deletions checkout-example/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
rootProject.name = 'adyen-java-spring-online-payments-checkout'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
21 changes: 13 additions & 8 deletions giftcard-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'
}
Expand All @@ -12,18 +12,23 @@ sourceCompatibility = 17
targetCompatibility = 17

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

testImplementation(libs.bundles.spring.test){
exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
developmentOnly 'org.springframework.boot:spring-boot-devtools'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

}

test {
useJUnitPlatform()
useJUnitPlatform()
}
7 changes: 0 additions & 7 deletions giftcard-example/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
rootProject.name = 'adyen-java-spring-online-payments-giftcard'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
17 changes: 11 additions & 6 deletions giving-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'
}
Expand All @@ -16,12 +16,17 @@ repositories {
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

testImplementation(libs.bundles.spring.test){
exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
developmentOnly 'org.springframework.boot:spring-boot-devtools'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

}

test {
Expand Down
7 changes: 0 additions & 7 deletions giving-example/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
rootProject.name = 'giving-example'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
21 changes: 13 additions & 8 deletions in-person-payments-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'
}
Expand All @@ -12,18 +12,23 @@ sourceCompatibility = 17
targetCompatibility = 17

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

testImplementation(libs.bundles.spring.test){
exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
developmentOnly 'org.springframework.boot:spring-boot-devtools'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

}

test {
useJUnitPlatform()
useJUnitPlatform()
}
7 changes: 0 additions & 7 deletions in-person-payments-example/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
rootProject.name = 'adyen-java-spring-in-person-payments'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
44 changes: 15 additions & 29 deletions paybylink-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,48 +1,34 @@
plugins {
alias(libs.plugins.spring.framework)
alias(libs.plugins.spring.dependency)
id 'org.springframework.boot' version '3.1.4'
id 'io.spring.dependency-management' version '1.1.3'

id 'java'

id "com.moowork.node" version "1.3.1"
}

group = 'com.adyen'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '17'

sourceCompatibility = 17
targetCompatibility = 17

repositories {
mavenCentral()
}

dependencies {
implementation libs.adyen.java
implementation libs.bundles.spring
}

tasks.named('test') {
useJUnitPlatform()
}
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:23.0.1'

developmentOnly 'org.springframework.boot:spring-boot-devtools'

tasks.register('myNpmInstall', Exec) {
workingDir 'src/main/js'
commandLine 'npm', 'install'
}

tasks.register('myNpmRun', Exec) {
workingDir 'src/main/js'
commandLine 'npm', 'run', 'dist'
}
testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}

myNpmInstall {
dependsOn nodeSetup
}

myNpmRun {
dependsOn myNpmInstall
}

jar {
dependsOn myNpmRun
test {
useJUnitPlatform()
}
8 changes: 0 additions & 8 deletions paybylink-example/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
rootProject.name = 'paybylink-example'

dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}

0 comments on commit e12b230

Please sign in to comment.