Skip to content
Draft
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: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,4 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

- name: Run ktlint
run: ./gradlew ktlint
run: ./gradlew ktlintCheck
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ backend/app/src/main/resources/application-js-e2e.properties

/backend/*/build
/backend/*/out

/ee/backend/*/build
/ee/backend/*/out
42 changes: 6 additions & 36 deletions backend/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,19 @@
* Copyright (c) 2020. Tolgee
*/

buildscript {
repositories {
mavenCentral()
}
}

plugins {
id 'java'
id 'io.spring.dependency-management'
id 'org.jetbrains.kotlin.jvm'
id 'org.springframework.boot'
id "kotlin-allopen"

id 'io.tolgee.gradle.kotlin'
id 'io.tolgee.gradle.spring'
}

group = 'io.tolgee'

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: "org.jetbrains.kotlin.plugin.spring"
apply plugin: 'org.springframework.boot'
apply plugin: "kotlin-allopen"
apply plugin: 'io.spring.dependency-management'

repositories {
mavenCentral()
}

kotlin {
jvmToolchain(11)
}

allOpen {
annotation("org.springframework.stereotype.Component")
annotation("org.springframework.boot.test.context.SpringBootTest")
}

dependencies {
implementation libs.kotlinCoroutines
implementation "org.springframework.boot:spring-boot-starter-hateoas"
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation("org.springframework.boot:spring-boot-starter-security")
implementation "org.springframework.boot:spring-boot-starter-websocket"
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-websocket'

implementation(project(':data'))
implementation(project(':misc'))
Expand Down Expand Up @@ -72,7 +42,7 @@ dependencies {
implementation libs.jjwtApi
implementation libs.jjwtImpl
implementation libs.jjwtJackson
implementation("com.github.ben-manes.caffeine:caffeine:3.0.5")
implementation libs.caffeineCaching
api libs.postHog
}

Expand Down
62 changes: 11 additions & 51 deletions backend/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,27 @@
* Copyright (c) 2020. Tolgee
*/

buildscript {
repositories {
mavenCentral()
}
}

plugins {
id 'io.spring.dependency-management'
id 'org.springframework.boot'
id 'java'
id 'org.jetbrains.kotlin.jvm'
id "kotlin-jpa"
id "org.jetbrains.kotlin.kapt"
id "kotlin-allopen"
id 'io.tolgee.gradle.kotlin'
id 'io.tolgee.gradle.spring'
id 'io.tolgee.gradle.hibernate'
}

group = 'io.tolgee'

if (System.getenv().containsKey("VERSION")) {
project.version = System.getenv().get("VERSION")
} else {
project.version = 'local'
}

configurations {
developmentOnly
runtimeClasspath {
extendsFrom developmentOnly
}
}

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
apply plugin: "kotlin-allopen"
apply plugin: "org.jetbrains.kotlin.plugin.spring"

repositories {
mavenCentral()
}


allOpen {
annotation("javax.persistence.Entity")
annotation("javax.persistence.MappedSuperclass")
annotation("javax.persistence.Embeddable")
annotation("org.springframework.stereotype.Service")
annotation("org.springframework.stereotype.Component")
annotation("org.springframework.stereotype.Service")
annotation("org.springframework.transaction.annotation.Transactional")
annotation("org.springframework.beans.factory.annotation.Configurable")
annotation("org.springframework.boot.test.context.SpringBootTest")
}

kotlin {
jvmToolchain(11)
}

dependencies {
/**
* SPRING
*/
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-mail'
implementation 'org.springframework.boot:spring-boot-starter-cache'
implementation("org.springframework.boot:spring-boot-starter-security")
Expand All @@ -89,8 +44,9 @@ dependencies {
implementation libs.springmockk
implementation libs.jsonUnitAssert
testImplementation libs.mockito
testImplementation("io.findify:s3mock_2.13:0.2.6")
testImplementation group: 'org.springframework.batch', name: 'spring-batch-test', version: '4.3.5'
testImplementation libs.amazonS3Mock
testImplementation libs.socketIoClient
testImplementation 'org.springframework.batch:spring-batch-test'
testImplementation libs.sendInBlue
testImplementation "org.springframework.boot:spring-boot-starter-websocket"

Expand Down Expand Up @@ -171,6 +127,10 @@ dependencies {
implementation(project(':security'))
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

test {
useJUnitPlatform()
maxHeapSize = "2048m"
Expand Down
2 changes: 2 additions & 0 deletions backend/app/src/test/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#debug: true

spring:
autoconfigure:
exclude:
Expand Down
84 changes: 15 additions & 69 deletions backend/data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,15 @@
* Copyright (c) 2020. Tolgee
*/

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "org.hibernate:hibernate-gradle-plugin:5.6.10.Final"
}
}

plugins {
id 'io.spring.dependency-management'
id 'org.springframework.boot'
id 'java'
id 'org.liquibase.gradle'
id 'org.jetbrains.kotlin.jvm'
id "kotlin-jpa"
id "org.jetbrains.kotlin.kapt"
id "kotlin-allopen"
id 'io.tolgee.gradle.kotlin'
id 'io.tolgee.gradle.spring'
id 'io.tolgee.gradle.hibernate'
id 'io.tolgee.gradle.liquibase'
}

group = 'io.tolgee'

if (System.getenv().containsKey("VERSION")) {
project.version = System.getenv().get("VERSION")
} else {
project.version = 'local'
}

configurations {
developmentOnly
runtimeClasspath {
Expand All @@ -38,29 +19,6 @@ configurations {
ktlint
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
apply plugin: "org.jetbrains.kotlin.plugin.spring"
apply plugin: "kotlin-allopen"
apply plugin: "kotlin-kapt"
apply plugin: 'kotlin'
apply plugin: 'org.hibernate.orm'

repositories {
mavenCentral()
jcenter()
}

idea {
module {
generatedSourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
}
}

hibernate {
enhance {
enableLazyInitialization = true
Expand All @@ -70,34 +28,18 @@ hibernate {
}
}

allOpen {
annotation("javax.persistence.Entity")
annotation("javax.persistence.MappedSuperclass")
annotation("javax.persistence.Embeddable")
annotation("org.springframework.stereotype.Component")
annotation("org.springframework.transaction.annotation.Transactional")
annotation("org.springframework.stereotype.Service")
annotation("org.springframework.beans.factory.annotation.Configurable")
}

apply from: "$rootDir/gradle/liquibase.gradle"

configureLiquibase("public", "hibernate:spring:io.tolgee", 'src/main/resources/db/changelog/schema.xml')
//configureLiquibase("public", "hibernate:spring:io.tolgee", 'src/main/resources/db/changelog/schema.xml')

diff.dependsOn compileKotlin
diffChangeLog.dependsOn compileKotlin

kotlin {
jvmToolchain(11)
}

dependencies {
/**
* SPRING
*/
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation "org.springframework.boot:spring-boot-starter-validation"
implementation("org.springframework.data:spring-data-envers")
implementation("org.springframework.boot:spring-boot-starter-security")
Expand Down Expand Up @@ -130,7 +72,7 @@ dependencies {
implementation libs.liquibaseCore
liquibaseRuntime libs.liquibaseCore
liquibaseRuntime 'org.postgresql:postgresql'
liquibaseRuntime('org.liquibase:liquibase-groovy-dsl:3.0.2')
liquibaseRuntime libs.liquibaseGroovyDsl
liquibaseRuntime libs.liquibaseHibernate
liquibaseRuntime libs.kotlinReflect
liquibaseRuntime sourceSets.main.output
Expand Down Expand Up @@ -162,19 +104,19 @@ dependencies {
* MISC
*/
implementation libs.commonsCodec
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
implementation libs.commonsText
implementation libs.icu4j
implementation libs.jjwtApi
implementation libs.jjwtImpl
implementation libs.jjwtJackson
implementation libs.jacksonModuleKotlin
implementation 'net.datafaker:datafaker:1.5.0'
implementation 'jaxen:jaxen:1.2.0'
implementation libs.datafaker
implementation libs.jaxen
implementation libs.sendInBlue
implementation libs.sentry
implementation libs.hibernateTypes
liquibaseRuntime libs.hibernateTypes
implementation 'com.eatthepath:java-otp:0.4.0'
implementation libs.otp
implementation libs.postHog
implementation libs.micrometerPrometheus

Expand All @@ -196,6 +138,10 @@ dependencies {
implementation(project(':misc'))
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

test {
useJUnitPlatform()
maxHeapSize = "2048m"
Expand Down
48 changes: 3 additions & 45 deletions backend/development/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,10 @@
* Copyright (c) 2020. Tolgee
*/

buildscript {
repositories {
mavenCentral()
}
}

plugins {
id 'io.spring.dependency-management'
id 'org.springframework.boot'
id 'java'
id 'org.jetbrains.kotlin.jvm'
id "kotlin-jpa"
id "org.jetbrains.kotlin.kapt"
id "kotlin-allopen"
id 'io.tolgee.gradle.kotlin'
id 'io.tolgee.gradle.spring'
id 'io.tolgee.gradle.hibernate'
}

group = 'io.tolgee'
Expand All @@ -28,38 +18,6 @@ configurations {
ktlint
}

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
apply plugin: "kotlin-allopen"
apply plugin: "kotlin-kapt"

repositories {
mavenCentral()
}

kotlin {
jvmToolchain(11)
}

idea {
module {
generatedSourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
}
}

allOpen {
annotation("javax.persistence.Entity")
annotation("javax.persistence.MappedSuperclass")
annotation("javax.persistence.Embeddable")
annotation("org.springframework.stereotype.Component")
annotation("org.springframework.transaction.annotation.Transactional")
annotation("org.springframework.stereotype.Service")
annotation("org.springframework.beans.factory.annotation.Configurable")
}

dependencies {
/**
* SPRING
Expand Down
Loading