From 52e2c2f1457a39dcf6a1075fc7ecf559c4e41998 Mon Sep 17 00:00:00 2001 From: Napster Date: Sat, 9 Nov 2024 22:47:12 +0100 Subject: [PATCH] Dissolve platform subproject --- .gitignore | 1 - build.gradle | 98 +++++++++++++++++++---------------------------- gradle.lockfile | 26 ++++++------- platform/.gitkeep | 0 settings.gradle | 1 - 5 files changed, 52 insertions(+), 74 deletions(-) delete mode 100644 platform/.gitkeep diff --git a/.gitignore b/.gitignore index eb71ecad..4a8f623f 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,6 @@ hs_err_pid* /common/build /discord-wrapper/build /dashboard/build -/platform/build # Ignore Gradle GUI config gradle-app.setting diff --git a/build.gradle b/build.gradle index de1a679c..2485342f 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ ext { isProd = project.hasProperty('prod') } -configure(allprojects.findAll { it.name != 'platform' }) { +configure(allprojects) { apply plugin: 'java-library' apply plugin: 'idea' @@ -71,12 +71,6 @@ configure(allprojects.findAll { it.name != 'platform' }) { generatedSourceDirs += sourceSets.test.output.generatedSourcesDirs } } - - dependencies { - api platform(project(':platform')) - annotationProcessor platform(project(':platform')) - compileOnly platform(project(':platform')) - } } apply plugin: 'com.github.ben-manes.versions' @@ -178,43 +172,29 @@ allprojects { } defaultTasks 'build' -} -project(':platform') { - apply plugin: 'java-platform' - javaPlatform { - allowDependencies() + configurations { + globalPlatforms { + canBeResolved = false + canBeConsumed = false + } + + //we want to go with undertow which supports both webflux and servlets (togglz console is a servlet) + implementation.exclude module: "spring-boot-starter-reactor-netty" + implementation.exclude module: "spring-boot-starter-tomcat" } - dependencies { - api platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion") - api platform("io.prometheus:simpleclient_bom:$prometheusVersion") - api platform("io.sentry:sentry-bom:$sentryVersion") - constraints { - api "net.dv8tion:JDA:$jdaVersion" - api "club.minnced:discord-webhooks:$discordWebhooksVersion" - api "org.json:json:$orgJsonVersion" - api "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" - api "org.glassfish.jaxb:jaxb-core:$jaxbImplVersion" - api "org.glassfish.jaxb:jaxb-runtime:$jaxbImplVersion" - api "org.openjdk.nashorn:nashorn-core:$nashornVersion" - - api "space.npstr:prometheus_extensions:$promExtVersion" - - api "net.ttddyy:datasource-proxy:$dsProxyVersion" - api "org.flywaydb:flyway-core:$flywayVersion" - api "org.jooq:jooq:$jooqVersion" - api "org.jooq:jooq-meta:$jooqVersion" - api "org.jooq:jooq-codegen:$jooqVersion" - - api "org.togglz:togglz-core:$togglzVersion" - api "org.togglz:togglz-spring-boot-starter:$togglzVersion" - api "org.togglz:togglz-console:$togglzVersion" - api "org.togglz:togglz-spring-security:$togglzVersion" - - api "com.codeborne:selenide:$selenideVersion" - api "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + + configurations.configureEach { + if (canBeResolved) { + extendsFrom(configurations.globalPlatforms) } } + + dependencies { + globalPlatforms platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion") + globalPlatforms platform("io.prometheus:simpleclient_bom:$prometheusVersion") + globalPlatforms platform("io.sentry:sentry-bom:$sentryVersion") + } } project(':frontend') { @@ -288,11 +268,8 @@ ext { } dependencies { - flywayMigration platform(project(':platform')) - jooqGenerator platform(project(':platform')) - - implementation "net.dv8tion:JDA" - implementation "club.minnced:discord-webhooks" + implementation "net.dv8tion:JDA:$jdaVersion" + implementation "club.minnced:discord-webhooks:$discordWebhooksVersion" implementation "ch.qos.logback:logback-classic" implementation "io.sentry:sentry-logback" @@ -302,8 +279,8 @@ dependencies { implementation "org.yaml:snakeyaml" implementation "com.squareup.okhttp3:okhttp" implementation "com.github.ben-manes.caffeine:caffeine" - implementation "org.json:json" - implementation "org.openjdk.nashorn:nashorn-core" + implementation "org.json:json:$orgJsonVersion" + implementation "org.openjdk.nashorn:nashorn-core:$nashornVersion" implementation "io.lettuce:lettuce-core" implementation(group: "io.netty", name: "netty-transport-native-epoll", classifier: "linux-x86_64") @@ -314,23 +291,26 @@ dependencies { implementation "io.prometheus:simpleclient_logback" implementation "io.prometheus:simpleclient_common" implementation "io.prometheus:simpleclient_caffeine" - implementation "space.npstr:prometheus_extensions" + implementation "space.npstr:prometheus_extensions:$promExtVersion" implementation "org.postgresql:postgresql" implementation "com.zaxxer:HikariCP" - implementation "org.flywaydb:flyway-core" - implementation "net.ttddyy:datasource-proxy" + implementation "org.flywaydb:flyway-core:$flywayVersion" + implementation "net.ttddyy:datasource-proxy:$dsProxyVersion" - implementation "org.jooq:jooq" - implementation "org.jooq:jooq-codegen" - implementation "org.jooq:jooq-meta" + implementation "org.jooq:jooq:$jooqVersion" + implementation "org.jooq:jooq-codegen:$jooqVersion" + implementation "org.jooq:jooq-meta:$jooqVersion" flywayMigration "org.postgresql:postgresql" + jooqGenerator "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" + jooqGenerator "org.glassfish.jaxb:jaxb-core:$jaxbImplVersion" + jooqGenerator "org.glassfish.jaxb:jaxb-runtime:$jaxbImplVersion" jooqGenerator "org.postgresql:postgresql" - implementation "org.togglz:togglz-core" - implementation "org.togglz:togglz-spring-boot-starter" - implementation "org.togglz:togglz-console" - implementation "org.togglz:togglz-spring-security" + implementation "org.togglz:togglz-core:$togglzVersion" + implementation "org.togglz:togglz-spring-boot-starter:$togglzVersion" + implementation "org.togglz:togglz-console:$togglzVersion" + implementation "org.togglz:togglz-spring-security:$togglzVersion" implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.boot:spring-boot-starter-undertow" @@ -355,8 +335,8 @@ dependencies { testImplementation "org.springframework.security:spring-security-test" testImplementation "org.testcontainers:testcontainers" testImplementation "org.testcontainers:selenium" - testImplementation "com.codeborne:selenide" - testImplementation "org.mockito.kotlin:mockito-kotlin" + testImplementation "com.codeborne:selenide:$selenideVersion" + testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.awaitility:awaitility" } diff --git a/gradle.lockfile b/gradle.lockfile index 99d45526..3ab48b44 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -58,7 +58,9 @@ com.nimbusds:oauth2-oidc-sdk:9.43.4=compileClasspath,implementationDependenciesM com.squareup.okhttp3:okhttp:4.12.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okio:okio-jvm:3.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio:3.6.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:4.1.2=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.2=jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.sun.xml.bind:jaxb-core:4.0.5=jooqGenerator +com.sun.xml.bind:jaxb-impl:4.0.5=jooqGenerator com.zaxxer:HikariCP:5.0.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath commons-io:commons-io:2.17.0=testRuntimeClasspath dev.failsafe:failsafe:3.3.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -90,7 +92,7 @@ io.opentelemetry:opentelemetry-sdk-trace:1.42.1=testCompileClasspath,testImpleme io.opentelemetry:opentelemetry-sdk:1.42.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.projectreactor:reactor-core:3.6.11=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -io.prometheus:simpleclient_bom:0.16.0=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,flywayMigration,implementationDependenciesMetadata,jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.prometheus:simpleclient_bom:0.16.0=annotationProcessor,apiDependenciesMetadata,compile,compileClasspath,compileOnlyDependenciesMetadata,developmentOnly,flywayMigration,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jacocoAgent,jacocoAnt,jooqGenerator,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,productionRuntimeClasspath,runtimeClasspath,testAndDevelopmentOnly,testAnnotationProcessor,testApiDependenciesMetadata,testCompileClasspath,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntimeClasspath io.prometheus:simpleclient_caffeine:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.prometheus:simpleclient_hotspot:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -99,7 +101,7 @@ io.prometheus:simpleclient_tracer_common:0.16.0=compileClasspath,implementationD io.prometheus:simpleclient_tracer_otel:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.r2dbc:r2dbc-spi:1.0.0.RELEASE=compileClasspath,implementationDependenciesMetadata,jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -io.sentry:sentry-bom:7.16.0=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,flywayMigration,implementationDependenciesMetadata,jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.sentry:sentry-bom:7.16.0=annotationProcessor,apiDependenciesMetadata,compile,compileClasspath,compileOnlyDependenciesMetadata,developmentOnly,flywayMigration,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jacocoAgent,jacocoAnt,jooqGenerator,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,productionRuntimeClasspath,runtimeClasspath,testAndDevelopmentOnly,testAnnotationProcessor,testApiDependenciesMetadata,testCompileClasspath,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntimeClasspath io.sentry:sentry-kotlin-extensions:7.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.sentry:sentry-logback:7.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.sentry:sentry-spring-boot-jakarta:7.16.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -150,11 +152,11 @@ org.awaitility:awaitility:4.2.2=testCompileClasspath,testImplementationDependenc org.checkerframework:checker-qual:3.31.0=flywayMigration,jooqGenerator org.checkerframework:checker-qual:3.37.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.43.0=testImplementationDependenciesMetadata -org.eclipse.angus:angus-activation:2.0.2=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.2=jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.flywaydb:flyway-core:9.22.3=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.5=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.5=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.5=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.5=jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.5=jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.5=jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -178,8 +180,7 @@ org.jetbrains.kotlin:kotlin-compiler-runner:1.9.25=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-client:1.9.25=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.25=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.25=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.9.25=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-reflect:1.9.25=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.9.25=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-scripting-common:1.9.25=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.25=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest @@ -191,8 +192,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.25=compileClasspath,implementationDe org.jetbrains.kotlin:kotlin-stdlib:1.9.25=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlinx:atomicfu:0.21.0=implementationDependenciesMetadata,testImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=compileClasspath,kotlinBuildToolsApiClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath @@ -253,7 +253,7 @@ org.slf4j:slf4j-api:2.0.16=compileClasspath,implementationDependenciesMetadata,p org.springframework.boot:spring-boot-autoconfigure:3.2.11=compileOnlyDependenciesMetadata org.springframework.boot:spring-boot-autoconfigure:3.3.2=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.springframework.boot:spring-boot-configuration-processor:3.2.11=annotationProcessor -org.springframework.boot:spring-boot-dependencies:3.2.11=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,flywayMigration,implementationDependenciesMetadata,jooqGenerator,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.springframework.boot:spring-boot-dependencies:3.2.11=annotationProcessor,apiDependenciesMetadata,compile,compileClasspath,compileOnlyDependenciesMetadata,developmentOnly,flywayMigration,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jacocoAgent,jacocoAnt,jooqGenerator,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,productionRuntimeClasspath,runtimeClasspath,testAndDevelopmentOnly,testAnnotationProcessor,testApiDependenciesMetadata,testCompileClasspath,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntimeClasspath org.springframework.boot:spring-boot-devtools:3.2.11=compileClasspath,compileOnlyDependenciesMetadata org.springframework.boot:spring-boot-starter-aop:3.2.11=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:3.2.11=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -317,4 +317,4 @@ org.wildfly.common:wildfly-common:1.5.4.Final=compileClasspath,implementationDep org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath space.npstr:prometheus_extensions:1.7.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -empty=compile,developmentOnly,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testAndDevelopmentOnly,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions +empty= diff --git a/platform/.gitkeep b/platform/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/settings.gradle b/settings.gradle index 171d072a..90e5a400 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,4 +18,3 @@ rootProject.name = 'wolfia' include 'frontend' -include 'platform'