Skip to content

Commit

Permalink
chore: general updates gathered for 1.0.0-alpha7 release
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Gammon <[email protected]>
  • Loading branch information
sgammon committed Oct 6, 2023
1 parent 1b2beaa commit 1b4629c
Show file tree
Hide file tree
Showing 32 changed files with 4,156 additions and 3,259 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Verify plugin output (JS)
if: success()
run: |
file ./example/fullstack/node/build/distributions/*.*js
file ./example/fullstack/node/build/dist/js/*/*.*js
grep -Fq "esbuild" ./example/fullstack/node/build/esbuild/esbuild.*.*js
## Job: Verify plugin output (JVM)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![beta](https://img.shields.io/badge/status-beta-blue.svg)
[![CI](https://github.com/elide-dev/buildtools/actions/workflows/pre-merge.yaml/badge.svg)](https://github.com/elide-dev/buildtools/actions/workflows/pre-merge.yaml)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-Beta2-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Gradle](https://img.shields.io/badge/gradle-8.x-blue.svg?logo=gradle)](http://gradle.org)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=elide-dev_buildtools&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=elide-dev_buildtools)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=elide-dev_buildtools&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=elide-dev_buildtools)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import java.util.Properties

plugins {
java
embeddedKotlin("kapt") apply false
kotlin("kapt") version "1.9.20-Beta2" apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kover)
alias(libs.plugins.detekt)
Expand Down
18 changes: 0 additions & 18 deletions config/detekt/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ complexity:
thresholdInEnums: 11
ignoreDeprecated: false
ignorePrivate: false
ignoreOverridden: false

coroutines:
active: true
Expand Down Expand Up @@ -348,7 +347,6 @@ naming:
BooleanPropertyNaming:
active: false
allowedPattern: "^(is|has|are)"
ignoreOverridden: true
ClassNaming:
active: true
classPattern: "[A-Z][a-zA-Z0-9]*"
Expand All @@ -357,7 +355,6 @@ naming:
parameterPattern: "[a-z][A-Za-z0-9]*"
privateParameterPattern: "[a-z][A-Za-z0-9]*"
excludeClassPattern: "$^"
ignoreOverridden: true
EnumNaming:
active: true
enumEntryPattern: "[A-Z][_a-zA-Z0-9]*"
Expand All @@ -383,12 +380,10 @@ naming:
]
functionPattern: "[a-z][a-zA-Z0-9]*"
excludeClassPattern: "$^"
ignoreOverridden: true
FunctionParameterNaming:
active: true
parameterPattern: "[a-z][A-Za-z0-9]*"
excludeClassPattern: "$^"
ignoreOverridden: true
InvalidPackageDeclaration:
active: false
rootPackage: ""
Expand Down Expand Up @@ -430,7 +425,6 @@ naming:
variablePattern: "[a-z][A-Za-z0-9]*"
privateVariablePattern: "(_)?[a-z][A-Za-z0-9]*"
excludeClassPattern: "$^"
ignoreOverridden: true

performance:
active: true
Expand Down Expand Up @@ -594,14 +588,6 @@ style:
ExpressionBodySyntax:
active: false
includeLineWrapping: false
ForbiddenComment:
active: true
values:
- "FIXME:"
- "STOPSHIP:"
- "TODO:"
allowedPatterns: ""
customMessage: ""
ForbiddenImport:
active: false
imports: []
Expand Down Expand Up @@ -649,8 +635,6 @@ style:
ignoreEnums: false
ignoreRanges: false
ignoreExtensionFunctions: true
MandatoryBracesIfStatements:
active: false
MandatoryBracesLoops:
active: false
MaxLineLength:
Expand All @@ -677,8 +661,6 @@ style:
active: true
OptionalUnit:
active: false
OptionalWhenBraces:
active: false
PreferToOverPairSyntax:
active: false
ProtectedMemberInFinalClass:
Expand Down
12 changes: 4 additions & 8 deletions example/static/server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {
alias(libs.plugins.micronaut.aot)

kotlin("jvm")
// alias(libs.plugins.ksp)
alias(libs.plugins.ksp)
id("dev.elide.buildtools.plugin")
}

Expand All @@ -23,8 +23,8 @@ application {
}

dependencies {
// ksp(libs.elide.tools.processor)
// ksp(libs.autoService.ksp)
ksp(libs.elide.tools.processor)
ksp(libs.autoService.ksp)

implementation(libs.elide.server)
implementation(libs.elide.proto.core)
Expand All @@ -36,17 +36,13 @@ dependencies {
}

micronaut {
version = "3.10.0"
version = "4.1.2"
}

elide {
mode = BuildMode.DEVELOPMENT

server {
// ssg {
// enable()
// }

assets {
bundler {
format(ManifestFormat.BINARY)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kotlin.code.style = official
versions.java.minimum = 17
versions.java.language = 17
versions.java.target = 17
versions.kotlin.sdk = 1.9.10
versions.kotlin.sdk = 1.9.20-Beta2
versions.kotlin.language = 1.9

kotlin.parallel.tasks.in.project = true
Expand Down
36 changes: 17 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[versions]
elide = "1.0-v3-alpha4-b12"
ksp = "1.9.10-1.0.13"
elide = "1.0.0-alpha7"
elideTools = "1.0.0-alpha7"
ksp = "1.9.20-Beta2-1.0.13"
detekt = "1.23.1"
kotlin = "1.9.10"
kotlin = "1.9.20-Beta2"
kotlin_dsl = "4.0.7"
ktlint = "0.50.0"
ktlintGradle = "11.5.0"
kotlinx_coroutines = "1.7.3"
kotlinx_collections = "0.4-wasm0"
kotlinx_collections = "0.3.5"
kotlinx_datetime = "0.4.1"
kotlinx_serialization = "1.5.1"
kotlinx_serialization = "1.6.0"
kotlinx_abiValidator = "0.13.2"
google_api_common = "2.14.1"
google_html_types = "1.0.8"
Expand All @@ -19,7 +20,7 @@ pluginProtobuf = "0.9.3"
versionCheck = "0.47.0"
nodePlugin = "5.0.0"
sonar = "4.3.0.3225"
protobuf = "3.24.3"
protobuf = "3.21.2"
truth = "1.1.5"
picocli = "4.7.4"
slf4j = "2.0.9"
Expand All @@ -34,13 +35,12 @@ shadow_plugin = "7.1.2"
soy = "2022-10-26"
closure = "v20230103"
closure_stylesheets = "1.5.0"
buildconfig_plugin = "3.1.0"
buildconfig_plugin = "4.1.2"
auto_service = "1.1.1"
kover_plugin = "0.7.3"
testLoggerPlugin = "3.2.0"
dependencyAnalysis = "1.20.0"

micronaut = "4.1.0"
micronaut = "4.1.2"
micronaut_plugin = "4.0.3"

[plugins]
Expand Down Expand Up @@ -124,25 +124,23 @@ google_auto_service_annotations = { group = "com.google.auto.service", name = "a

elide_core = { group = "dev.elide", name = "elide-core", version.ref = "elide" }
elide_base = { group = "dev.elide", name = "elide-base", version.ref = "elide" }
elide_ssg = { group = "dev.elide", name = "elide-ssg", version.ref = "elide" }
elide_server = { group = "dev.elide", name = "elide-server", version.ref = "elide" }
elide_proto_core = { group = "dev.elide", name = "elide-proto-core", version.ref = "elide" }
elide_proto_legacy = { group = "dev.elide", name = "elide-proto-core", version = "1.0-v3-alpha1-rc38" }
elide_proto_protobuf = { group = "dev.elide", name = "elide-proto-protobuf", version.ref = "elide" }
elide_proto_flatbuffers = { group = "dev.elide", name = "elide-proto-flatbuffers", version.ref = "elide" }
elide_proto_kotlinx = { group = "dev.elide", name = "elide-proto-kotlinx", version.ref = "elide" }
elide_tools_processor = { group = "dev.elide.tools", name = "processor", version.ref = "elide" }
elide_tools_conventions = { group = "dev.elide.tools", name = "elide-convention-plugins", version.ref = "elide" }
elide_tools_substrate = { group = "dev.elide.tools", name = "elide-substrate", version.ref = "elide" }
elide_bom_catalog = { group = "dev.elide", name = "bom", version.ref = "elide" }
elide_bom_platform = { group = "dev.elide", name = "platform", version.ref = "elide" }
elide_kotlin_plugin_injekt = { group = "dev.elide.tools.kotlin.plugin", name = "injekt-plugin", version.ref = "elide" }
elide_kotlin_plugin_interakt = { group = "dev.elide.tools.kotlin.plugin", name = "interakt-plugin", version.ref = "elide" }
elide_kotlin_plugin_redakt = { group = "dev.elide.tools.kotlin.plugin", name = "redakt-plugin", version.ref = "elide" }
elide_kotlin_plugin_sekret = { group = "dev.elide.tools.kotlin.plugin", name = "sekret-plugin", version.ref = "elide" }
elide_tools_processor = { group = "dev.elide.tools", name = "elide-processor", version.ref = "elideTools" }
elide_tools_substrate = { group = "dev.elide.tools", name = "elide-substrate", version.ref = "elideTools" }
elide_kotlin_plugin_redakt = { group = "dev.elide.tools.kotlin.plugin", name = "redakt-plugin", version.ref = "elideTools" }
#elide_proto_legacy = { group = "dev.elide", name = "proto", version = "1.0-v3-alpha1-rc38" }
#elide_kotlin_plugin_injekt = { group = "dev.elide.tools.kotlin.plugin", name = "injekt-plugin", version.ref = "elideTools" }
#elide_kotlin_plugin_interakt = { group = "dev.elide.tools.kotlin.plugin", name = "interakt-plugin", version.ref = "elideTools" }
#elide_kotlin_plugin_sekret = { group = "dev.elide.tools.kotlin.plugin", name = "sekret-plugin", version.ref = "elideTools" }

plugin_node = { group = "com.github.node-gradle", name = "gradle-node-plugin", version.ref = "nodePlugin" }
plugin_buildConfig = { group = "com.github.gmazzo", name = "gradle-buildconfig-plugin", version.ref = "buildconfig_plugin" }
plugin_buildConfig = { group = "com.github.gmazzo.buildconfig", name = "plugin", version.ref = "buildconfig_plugin" }
plugin_kotlin_allopen = { group = "org.jetbrains.kotlin", name = "kotlin-allopen", version.ref = "kotlin" }
plugin_kotlin_noarg = { group = "org.jetbrains.kotlin", name = "kotlin-noarg", version.ref = "kotlin" }
plugin_kotlinx_atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu-gradle-plugin", version.ref = "atomicfu" }
Expand Down
Binary file modified gradle/verification-keyring.gpg
Binary file not shown.
Loading

0 comments on commit 1b4629c

Please sign in to comment.