Skip to content

Commit 6d9cd37

Browse files
authored
Merge pull request #623 from lunatech-labs/rollback-gradle-upgrade
Rollback Gradle upgrade
2 parents a0123a4 + cefe5cb commit 6d9cd37

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

build.gradle

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
// root-level build.gradle
22
plugins {
3-
id 'org.jlleitschuh.gradle.ktlint' version "12.1.1"
3+
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
44
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
55
id 'com.github.autostyle' version '3.2'
66
id 'application'
77
}
88

9-
group = "com.lunatech" // A company name, for example, `org.jetbrains`
10-
version = "1.0.0" // Version to assign to the built artifact
11-
12-
application {
13-
mainClass = "io.ktor.server.netty.EngineMain"
9+
base {
10+
group 'com.lunatech'
11+
version '0.0.1'
12+
mainClassName = "io.ktor.server.netty.EngineMain"
1413
}
1514

1615
sourceSets {
@@ -61,25 +60,23 @@ dependencies {
6160
testImplementation "io.ktor:ktor-server-tests-jvm:2.3.7"
6261
}
6362

64-
tasks.register('buildAll', Exec) {
65-
dependsOn['buildFrontApp']
63+
task buildAll(type: Exec, dependsOn: ['buildFrontApp']) {
6664
group "Build All App"
6765
description 'Build All App'
6866
executable "./gradlew"
6967
args "--no-daemon", "assemble"
7068
}
7169

7270
//Build React App
73-
tasks.register('buildFrontApp', Exec) {
74-
dependsOn['installReactApp']
71+
task buildFrontApp(type: Exec, dependsOn: ['installReactApp']) {
7572
group "Front App"
7673
description 'Build React App'
7774
executable "npm"
7875
args "run-script", "build", "--prefix", "./frontend/"
7976
}
8077

8178
//Install package npm for front app (React)
82-
tasks.register('installReactApp', Exec) {
79+
task installReactApp(type: Exec) {
8380
group "Front App"
8481
description 'Build React App'
8582
executable "npm"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Apr 26 11:42:52 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)