Skip to content

Commit af78c7c

Browse files
VirtlinkVirtlink
committed
Reformat code to match Kotlin official style
1 parent 7d208b9 commit af78c7c

File tree

135 files changed

+3354
-3199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+3354
-3199
lines changed

‎build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
2-
id("org.metaborg.gradle.config.root-project") version "0.5.6"
3-
id("org.metaborg.gitonium") version "1.2.0"
2+
id("org.metaborg.gradle.config.root-project") version "0.5.6"
3+
id("org.metaborg.gitonium") version "1.2.0"
44
}
55

66
// Auto-accept build scan TOS
77
extensions.findByName("buildScan")?.withGroovyBuilder {
8-
try {
9-
// New Develocity plugin
10-
setProperty("termsOfUseUrl", "https://gradle.com/help/legal-terms-of-use")
11-
setProperty("termsOfUseAgree", "yes")
12-
} catch (ex: groovy.lang.MissingPropertyException) {
13-
// Deprecated Gradle Enterprise plugin
14-
setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
15-
setProperty("termsOfServiceAgree", "yes")
16-
}
8+
try {
9+
// New Develocity plugin
10+
setProperty("termsOfUseUrl", "https://gradle.com/help/legal-terms-of-use")
11+
setProperty("termsOfUseAgree", "yes")
12+
} catch (ex: groovy.lang.MissingPropertyException) {
13+
// Deprecated Gradle Enterprise plugin
14+
setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
15+
setProperty("termsOfServiceAgree", "yes")
16+
}
1717
}

‎core/aterm.common/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
77

8-
api("org.metaborg:common")
8+
api("org.metaborg:common")
99

10-
api("org.metaborg.devenv:org.spoofax.terms")
10+
api("org.metaborg.devenv:org.spoofax.terms")
1111

12-
// Depend on Stratego projects for access to standard library strategies which do aterm pretty printing.
13-
implementation("org.metaborg.devenv:org.spoofax.interpreter.core")
14-
implementation("org.metaborg.devenv:org.strategoxt.strj")
12+
// Depend on Stratego projects for access to standard library strategies which do aterm pretty printing.
13+
implementation("org.metaborg.devenv:org.spoofax.interpreter.core")
14+
implementation("org.metaborg.devenv:org.strategoxt.strj")
1515

16-
compileOnly("org.checkerframework:checker-qual-android")
16+
compileOnly("org.checkerframework:checker-qual-android")
1717
}

‎core/build.gradle.kts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
plugins {
2-
id("org.metaborg.gradle.config.root-project") version "0.5.6"
3-
id("org.metaborg.gitonium") version "1.2.0"
2+
id("org.metaborg.gradle.config.root-project") version "0.5.6"
3+
id("org.metaborg.gitonium") version "1.2.0"
44

5-
// Set versions for plugins to use, only applying them in subprojects (apply false here).
6-
id("org.metaborg.gradle.config.kotlin-gradle-plugin") version "0.5.6" apply false
7-
id("org.metaborg.coronium.bundle") version "0.3.17" apply false
8-
id("biz.aQute.bnd.builder") version "5.3.0" apply false
9-
id("org.jetbrains.intellij") version "1.4.0" apply false
10-
kotlin("jvm") version "1.4.20" apply false // Use 1.4.20 to keep in sync with embedded Kotlin version of Gradle 6.8.
11-
`kotlin-dsl` apply false
5+
// Set versions for plugins to use, only applying them in subprojects (apply false here).
6+
id("org.metaborg.gradle.config.kotlin-gradle-plugin") version "0.5.6" apply false
7+
id("org.metaborg.coronium.bundle") version "0.3.17" apply false
8+
id("biz.aQute.bnd.builder") version "5.3.0" apply false
9+
id("org.jetbrains.intellij") version "1.4.0" apply false
10+
kotlin("jvm") version "1.4.20" apply false // Use 1.4.20 to keep in sync with embedded Kotlin version of Gradle 6.8.
11+
`kotlin-dsl` apply false
1212
}
1313

1414
subprojects {
15-
metaborg {
16-
configureSubProject()
17-
}
15+
metaborg {
16+
configureSubProject()
17+
}
1818
}
1919

2020
val spoofax2Version: String = System.getProperty("spoofax2Version")
2121
val spoofax2DevenvVersion: String = System.getProperty("spoofax2DevenvVersion")
2222
allprojects {
23-
ext["spoofax2Version"] = spoofax2Version
24-
ext["spoofax2DevenvVersion"] = spoofax2DevenvVersion
23+
ext["spoofax2Version"] = spoofax2Version
24+
ext["spoofax2DevenvVersion"] = spoofax2DevenvVersion
2525
}

‎core/constraint.common/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
10-
api(project(":aterm.common"))
11-
api(project(":jsglr.common"))
12-
api(project(":stratego.common"))
9+
api("org.metaborg:common")
10+
api(project(":aterm.common"))
11+
api(project(":jsglr.common"))
12+
api(project(":stratego.common"))
1313

14-
api("org.metaborg:log.api")
14+
api("org.metaborg:log.api")
1515

16-
implementation("org.metaborg.devenv:nabl2.terms")
17-
implementation("org.metaborg.devenv:org.metaborg.util")
16+
implementation("org.metaborg.devenv:nabl2.terms")
17+
implementation("org.metaborg.devenv:org.metaborg.util")
1818

19-
compileOnly("org.checkerframework:checker-qual-android")
20-
compileOnly("org.derive4j:derive4j-annotation")
19+
compileOnly("org.checkerframework:checker-qual-android")
20+
compileOnly("org.derive4j:derive4j-annotation")
2121

22-
annotationProcessor("org.derive4j:derive4j")
22+
annotationProcessor("org.derive4j:derive4j")
2323
}

‎core/constraint.pie/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
10-
implementation(project(":aterm.common"))
11-
api(project(":constraint.common"))
12-
api(project(":spoofax.core"))
13-
api("org.metaborg:pie.api")
9+
api("org.metaborg:common")
10+
implementation(project(":aterm.common"))
11+
api(project(":constraint.common"))
12+
api(project(":spoofax.core"))
13+
api("org.metaborg:pie.api")
1414

15-
compileOnly("org.checkerframework:checker-qual-android")
16-
compileOnly("org.derive4j:derive4j-annotation")
15+
compileOnly("org.checkerframework:checker-qual-android")
16+
compileOnly("org.derive4j:derive4j-annotation")
1717

18-
annotationProcessor("org.derive4j:derive4j")
18+
annotationProcessor("org.derive4j:derive4j")
1919
}

‎core/esv.common/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
77

8-
api("org.metaborg:common")
9-
api("org.metaborg:log.api")
10-
api("org.metaborg.devenv:org.spoofax.terms")
11-
implementation("org.metaborg.devenv:org.spoofax.jsglr") // TODO: avoid dependency to jsglr, only need it for imploder attachment.
8+
api("org.metaborg:common")
9+
api("org.metaborg:log.api")
10+
api("org.metaborg.devenv:org.spoofax.terms")
11+
implementation("org.metaborg.devenv:org.spoofax.jsglr") // TODO: avoid dependency to jsglr, only need it for imploder attachment.
1212

13-
compileOnly("org.checkerframework:checker-qual-android")
13+
compileOnly("org.checkerframework:checker-qual-android")
1414
}

‎core/jsglr.common/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
9+
api("org.metaborg:common")
1010

11-
api("org.metaborg:resource")
12-
api("org.metaborg.devenv:jsglr.shared")
13-
api("org.metaborg.devenv:org.spoofax.jsglr")
14-
api("org.metaborg.devenv:org.spoofax.terms")
11+
api("org.metaborg:resource")
12+
api("org.metaborg.devenv:jsglr.shared")
13+
api("org.metaborg.devenv:org.spoofax.jsglr")
14+
api("org.metaborg.devenv:org.spoofax.terms")
1515

16-
compileOnly("org.checkerframework:checker-qual-android")
17-
compileOnly("org.derive4j:derive4j-annotation")
16+
compileOnly("org.checkerframework:checker-qual-android")
17+
compileOnly("org.derive4j:derive4j-annotation")
1818

19-
annotationProcessor("org.derive4j:derive4j")
19+
annotationProcessor("org.derive4j:derive4j")
2020
}

‎core/jsglr.pie/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
10-
implementation(project(":aterm.common"))
11-
api(project(":jsglr.common"))
12-
api(project(":spoofax.core"))
13-
api("org.metaborg:pie.api")
9+
api("org.metaborg:common")
10+
implementation(project(":aterm.common"))
11+
api(project(":jsglr.common"))
12+
api(project(":spoofax.core"))
13+
api("org.metaborg:pie.api")
1414

15-
compileOnly("org.checkerframework:checker-qual-android")
16-
compileOnly("org.immutables:value-annotations")
17-
compileOnly("org.derive4j:derive4j-annotation")
15+
compileOnly("org.checkerframework:checker-qual-android")
16+
compileOnly("org.immutables:value-annotations")
17+
compileOnly("org.derive4j:derive4j-annotation")
1818

19-
annotationProcessor("org.immutables:value")
20-
annotationProcessor("org.derive4j:derive4j")
19+
annotationProcessor("org.immutables:value")
20+
annotationProcessor("org.derive4j:derive4j")
2121
}

‎core/jsglr1.common/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
10-
api(project(":jsglr.common"))
11-
api("org.metaborg.devenv:org.spoofax.jsglr")
9+
api("org.metaborg:common")
10+
api(project(":jsglr.common"))
11+
api("org.metaborg.devenv:org.spoofax.jsglr")
1212

13-
compileOnly("org.checkerframework:checker-qual-android")
14-
compileOnly("org.derive4j:derive4j-annotation")
13+
compileOnly("org.checkerframework:checker-qual-android")
14+
compileOnly("org.derive4j:derive4j-annotation")
1515

16-
annotationProcessor("org.derive4j:derive4j")
16+
annotationProcessor("org.derive4j:derive4j")
1717
}

‎core/jsglr2.common/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("org.metaborg:common")
10-
api(project(":jsglr.common"))
11-
api("org.metaborg.devenv:org.spoofax.jsglr2")
9+
api("org.metaborg:common")
10+
api(project(":jsglr.common"))
11+
api("org.metaborg.devenv:org.spoofax.jsglr2")
1212

13-
compileOnly("org.checkerframework:checker-qual-android")
14-
compileOnly("org.derive4j:derive4j-annotation")
13+
compileOnly("org.checkerframework:checker-qual-android")
14+
compileOnly("org.derive4j:derive4j-annotation")
1515

16-
annotationProcessor("org.derive4j:derive4j")
16+
annotationProcessor("org.derive4j:derive4j")
1717
}

‎core/nabl2.common/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
77

8-
api("org.metaborg:common")
8+
api("org.metaborg:common")
99

10-
api("org.metaborg.devenv:nabl2.solver")
10+
api("org.metaborg.devenv:nabl2.solver")
1111

12-
compileOnly("org.checkerframework:checker-qual-android")
12+
compileOnly("org.checkerframework:checker-qual-android")
1313
}

‎core/settings.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
rootProject.name = "spoofax3.core.root"
22

33
pluginManagement {
4-
repositories {
5-
maven("https://artifacts.metaborg.org/content/groups/public/")
6-
}
4+
repositories {
5+
maven("https://artifacts.metaborg.org/content/groups/public/")
6+
}
77
}
88

99
include("spoofax.depconstraints")

‎core/spoofax.cli/build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
7-
annotationProcessor(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
7+
annotationProcessor(platform(project(":spoofax.depconstraints")))
88

9-
api("com.google.dagger:dagger")
10-
implementation(project(":spoofax.core"))
11-
api("info.picocli:picocli")
9+
api("com.google.dagger:dagger")
10+
implementation(project(":spoofax.core"))
11+
api("info.picocli:picocli")
1212

13-
compileOnly("org.checkerframework:checker-qual-android")
13+
compileOnly("org.checkerframework:checker-qual-android")
1414

15-
annotationProcessor("com.google.dagger:dagger-compiler")
16-
annotationProcessor("info.picocli:picocli-codegen")
15+
annotationProcessor("com.google.dagger:dagger-compiler")
16+
annotationProcessor("info.picocli:picocli-codegen")
1717
}
1818

1919
tasks.compileJava {
20-
options.compilerArgs.add("-Aproject=${project.group}/${project.name}")
20+
options.compilerArgs.add("-Aproject=${project.group}/${project.name}")
2121
}

‎core/spoofax.common/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id("org.metaborg.gradle.config.java-library")
2+
id("org.metaborg.gradle.config.java-library")
33
}
44

55
dependencies {
6-
api(platform(project(":spoofax.depconstraints")))
6+
api(platform(project(":spoofax.depconstraints")))
77

8-
compileOnly("org.checkerframework:checker-qual-android")
8+
compileOnly("org.checkerframework:checker-qual-android")
99
}

0 commit comments

Comments
 (0)