Skip to content

Commit 775129b

Browse files
fprochazkafprochazka
committed
Gradle build redesign
1 parent e35216e commit 775129b

28 files changed

+356
-360
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,4 +396,4 @@ jobs:
396396
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
397397

398398
- name: Run ktlint
399-
run: ./gradlew ktlint
399+
run: ./gradlew ktlintCheck

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ backend/app/src/main/resources/application-js-e2e.properties
6262

6363
/backend/*/build
6464
/backend/*/out
65-
65+
/ee/backend/*/build
66+
/ee/backend/*/out

‎backend/api/build.gradle‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,21 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
}
10-
115
plugins {
12-
id 'java'
13-
id 'io.spring.dependency-management'
14-
id 'org.jetbrains.kotlin.jvm'
15-
id 'org.springframework.boot'
16-
id "kotlin-allopen"
17-
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
8+
id 'io.tolgee.gradle.spring'
189
}
1910

2011
group = 'io.tolgee'
2112

2213
apply plugin: 'java'
2314
apply plugin: 'idea'
24-
apply plugin: "org.jetbrains.kotlin.plugin.spring"
15+
apply plugin: 'org.jetbrains.kotlin.plugin.spring'
2516
apply plugin: 'org.springframework.boot'
26-
apply plugin: "kotlin-allopen"
17+
apply plugin: 'org.jetbrains.kotlin.plugin.allopen'
2718
apply plugin: 'io.spring.dependency-management'
2819

29-
repositories {
30-
mavenCentral()
31-
}
32-
3320
kotlin {
3421
jvmToolchain(11)
3522
}
@@ -41,10 +28,10 @@ allOpen {
4128

4229
dependencies {
4330
implementation libs.kotlinCoroutines
44-
implementation "org.springframework.boot:spring-boot-starter-hateoas"
31+
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
4532
implementation 'org.springframework.boot:spring-boot-starter-web'
46-
implementation("org.springframework.boot:spring-boot-starter-security")
47-
implementation "org.springframework.boot:spring-boot-starter-websocket"
33+
implementation 'org.springframework.boot:spring-boot-starter-security'
34+
implementation 'org.springframework.boot:spring-boot-starter-websocket'
4835

4936
implementation(project(':data'))
5037
implementation(project(':misc'))
@@ -71,7 +58,7 @@ dependencies {
7158
implementation libs.jjwtApi
7259
implementation libs.jjwtImpl
7360
implementation libs.jjwtJackson
74-
implementation("com.github.ben-manes.caffeine:caffeine:3.0.5")
61+
implementation libs.caffeineCaching
7562
api libs.postHog
7663
}
7764

‎backend/app/build.gradle‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,15 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
}
10-
115
plugins {
12-
id 'io.spring.dependency-management'
13-
id 'org.springframework.boot'
14-
id 'java'
15-
id 'org.jetbrains.kotlin.jvm'
16-
id "kotlin-jpa"
17-
id "org.jetbrains.kotlin.kapt"
18-
id "kotlin-allopen"
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
8+
id 'io.tolgee.gradle.spring'
9+
id 'io.tolgee.gradle.hibernate'
1910
}
2011

2112
group = 'io.tolgee'
2213

23-
if (System.getenv().containsKey("VERSION")) {
24-
project.version = System.getenv().get("VERSION")
25-
} else {
26-
project.version = 'local'
27-
}
28-
2914
configurations {
3015
developmentOnly
3116
runtimeClasspath {
@@ -38,14 +23,9 @@ apply plugin: 'idea'
3823
apply plugin: 'org.springframework.boot'
3924
apply plugin: 'io.spring.dependency-management'
4025
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
41-
apply plugin: "kotlin-allopen"
26+
apply plugin: "org.jetbrains.kotlin.plugin.allopen"
4227
apply plugin: "org.jetbrains.kotlin.plugin.spring"
4328

44-
repositories {
45-
mavenCentral()
46-
}
47-
48-
4929
allOpen {
5030
annotation("javax.persistence.Entity")
5131
annotation("javax.persistence.MappedSuperclass")
@@ -91,9 +71,9 @@ dependencies {
9171
implementation libs.springmockk
9272
implementation libs.jsonUnitAssert
9373
testImplementation libs.mockito
94-
testImplementation("io.findify:s3mock_2.13:0.2.6")
95-
testImplementation("io.socket:socket.io-client:1.0.1")
96-
testImplementation group: 'org.springframework.batch', name: 'spring-batch-test', version: '4.3.5'
74+
testImplementation libs.amazonS3Mock
75+
testImplementation libs.socketIoClient
76+
testImplementation 'org.springframework.batch:spring-batch-test'
9777
testImplementation libs.sendInBlue
9878
testImplementation "org.springframework.boot:spring-boot-starter-websocket"
9979

‎backend/app/src/test/resources/application.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#debug: true
2+
13
spring:
24
autoconfigure:
35
exclude:

‎backend/data/build.gradle‎

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,16 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
dependencies {
10-
classpath "org.hibernate:hibernate-gradle-plugin:5.6.10.Final"
11-
}
12-
}
13-
145
plugins {
15-
id 'io.spring.dependency-management'
16-
id 'org.springframework.boot'
17-
id 'java'
18-
id 'org.liquibase.gradle'
19-
id 'org.jetbrains.kotlin.jvm'
20-
id "kotlin-jpa"
21-
id "org.jetbrains.kotlin.kapt"
22-
id "kotlin-allopen"
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
8+
id 'io.tolgee.gradle.spring'
9+
id 'io.tolgee.gradle.hibernate'
10+
id 'io.tolgee.gradle.liquibase'
2311
}
2412

2513
group = 'io.tolgee'
2614

27-
if (System.getenv().containsKey("VERSION")) {
28-
project.version = System.getenv().get("VERSION")
29-
} else {
30-
project.version = 'local'
31-
}
32-
3315
configurations {
3416
developmentOnly
3517
runtimeClasspath {
@@ -45,16 +27,11 @@ apply plugin: 'org.springframework.boot'
4527
apply plugin: 'io.spring.dependency-management'
4628
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
4729
apply plugin: "org.jetbrains.kotlin.plugin.spring"
48-
apply plugin: "kotlin-allopen"
49-
apply plugin: "kotlin-kapt"
30+
apply plugin: "org.jetbrains.kotlin.plugin.allopen"
31+
apply plugin: "org.jetbrains.kotlin.kapt"
5032
apply plugin: 'kotlin'
5133
apply plugin: 'org.hibernate.orm'
5234

53-
repositories {
54-
mavenCentral()
55-
jcenter()
56-
}
57-
5835
idea {
5936
module {
6037
generatedSourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
@@ -80,9 +57,7 @@ allOpen {
8057
annotation("org.springframework.beans.factory.annotation.Configurable")
8158
}
8259

83-
apply from: "$rootDir/gradle/liquibase.gradle"
84-
85-
configureLiquibase("public", "hibernate:spring:io.tolgee", 'src/main/resources/db/changelog/schema.xml')
60+
//configureLiquibase("public", "hibernate:spring:io.tolgee", 'src/main/resources/db/changelog/schema.xml')
8661

8762
diff.dependsOn compileKotlin
8863
diffChangeLog.dependsOn compileKotlin
@@ -130,7 +105,7 @@ dependencies {
130105
implementation libs.liquibaseCore
131106
liquibaseRuntime libs.liquibaseCore
132107
liquibaseRuntime 'org.postgresql:postgresql'
133-
liquibaseRuntime('org.liquibase:liquibase-groovy-dsl:3.0.2')
108+
liquibaseRuntime libs.liquibaseGroovyDsl
134109
liquibaseRuntime libs.liquibaseHibernate
135110
liquibaseRuntime libs.kotlinReflect
136111
liquibaseRuntime sourceSets.main.output
@@ -162,19 +137,19 @@ dependencies {
162137
* MISC
163138
*/
164139
implementation libs.commonsCodec
165-
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
140+
implementation libs.commonsText
166141
implementation libs.icu4j
167142
implementation libs.jjwtApi
168143
implementation libs.jjwtImpl
169144
implementation libs.jjwtJackson
170145
implementation libs.jacksonModuleKotlin
171-
implementation 'net.datafaker:datafaker:1.5.0'
172-
implementation 'jaxen:jaxen:1.2.0'
146+
implementation libs.datafaker
147+
implementation libs.jaxen
173148
implementation libs.sendInBlue
174149
implementation libs.sentry
175150
implementation libs.hibernateTypes
176151
liquibaseRuntime libs.hibernateTypes
177-
implementation 'com.eatthepath:java-otp:0.4.0'
152+
implementation libs.otp
178153
implementation libs.postHog
179154
implementation libs.micrometerPrometheus
180155

‎backend/development/build.gradle‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
}
10-
115
plugins {
12-
id 'io.spring.dependency-management'
13-
id 'org.springframework.boot'
14-
id 'java'
15-
id 'org.jetbrains.kotlin.jvm'
16-
id "kotlin-jpa"
17-
id "org.jetbrains.kotlin.kapt"
18-
id "kotlin-allopen"
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
8+
id 'io.tolgee.gradle.spring'
9+
id 'io.tolgee.gradle.hibernate'
1910
}
2011

2112
group = 'io.tolgee'
@@ -33,12 +24,8 @@ apply plugin: 'idea'
3324
apply plugin: 'org.springframework.boot'
3425
apply plugin: 'io.spring.dependency-management'
3526
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
36-
apply plugin: "kotlin-allopen"
37-
apply plugin: "kotlin-kapt"
38-
39-
repositories {
40-
mavenCentral()
41-
}
27+
apply plugin: "org.jetbrains.kotlin.plugin.allopen"
28+
apply plugin: "org.jetbrains.kotlin.kapt"
4229

4330
kotlin {
4431
jvmToolchain(11)

‎backend/misc/build.gradle‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
}
10-
115
plugins {
12-
id 'java'
13-
id 'org.jetbrains.kotlin.jvm'
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
148
}
159

1610
group = 'io.tolgee'
1711

1812
apply plugin: 'java'
1913
apply plugin: 'idea'
2014

21-
repositories {
22-
mavenCentral()
23-
}
24-
2515
kotlin {
2616
jvmToolchain(11)
2717
}

‎backend/testing/build.gradle‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,15 @@
22
* Copyright (c) 2020. Tolgee
33
*/
44

5-
buildscript {
6-
repositories {
7-
mavenCentral()
8-
}
9-
}
10-
115
plugins {
12-
id 'io.spring.dependency-management'
13-
id 'org.springframework.boot'
14-
id 'java'
15-
id 'org.jetbrains.kotlin.jvm'
16-
id "kotlin-jpa"
17-
id "org.jetbrains.kotlin.kapt"
18-
id "kotlin-allopen"
6+
id 'io.tolgee.gradle.base'
7+
id 'io.tolgee.gradle.kotlin'
8+
id 'io.tolgee.gradle.spring'
9+
id 'io.tolgee.gradle.hibernate'
1910
}
2011

2112
group = 'io.tolgee'
2213

23-
if (System.getenv().containsKey("VERSION")) {
24-
project.version = System.getenv().get("VERSION")
25-
} else {
26-
project.version = 'local'
27-
}
28-
2914
configurations {
3015
developmentOnly
3116
runtimeClasspath {
@@ -39,13 +24,8 @@ apply plugin: 'idea'
3924
apply plugin: 'org.springframework.boot'
4025
apply plugin: 'io.spring.dependency-management'
4126
apply plugin: "org.jetbrains.kotlin.plugin.jpa"
42-
apply plugin: "kotlin-allopen"
43-
apply plugin: "kotlin-kapt"
44-
45-
repositories {
46-
mavenCentral()
47-
jcenter()
48-
}
27+
apply plugin: "org.jetbrains.kotlin.plugin.allopen"
28+
apply plugin: "org.jetbrains.kotlin.kapt"
4929

5030
kotlin {
5131
jvmToolchain(11)

0 commit comments

Comments
 (0)