Skip to content

Commit 0fecaf4

Browse files
committed
Add include-code extension setup for docs
Closes gh-17160
1 parent d2d2b97 commit 0fecaf4

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

docs/antora.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ asciidoc:
1616
gh-old-samples-url: 'https://github.com/spring-projects/spring-security/tree/5.4.x/samples'
1717
gh-samples-url: "https://github.com/spring-projects/spring-security-samples/tree/{gh-tag}"
1818
gh-url: "https://github.com/spring-projects/spring-security/tree/{gh-tag}"
19+
include-java: 'example$docs-src/test/java/org/springframework/security/docs'
20+
include-kotlin: 'example$docs-src/test/kotlin/org/springframework/security/kt/docs'

docs/modules/ROOT/examples/docs-src

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../src

docs/spring-security-docs.gradle

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
plugins {
24
id 'org.antora' version '1.0.0'
35
id 'io.spring.antora.generate-antora-yml' version '0.0.1'
46
id 'io.spring.convention.repository'
7+
id 'kotlin'
58
}
69

710
apply plugin: 'io.spring.convention.docs'
@@ -33,10 +36,23 @@ tasks.register("generateAntoraResources") {
3336

3437
dependencies {
3538
testImplementation platform(project(':spring-security-dependencies'))
39+
testImplementation project(':spring-security-config')
40+
testImplementation project(path : ':spring-security-config', configuration : 'tests')
41+
testImplementation project(':spring-security-test')
3642
testImplementation 'com.unboundid:unboundid-ldapsdk'
3743
testImplementation libs.webauthn4j.core
44+
testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
45+
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
3846
testImplementation 'org.apache.directory.server:apacheds-core'
3947
testImplementation 'org.springframework:spring-core'
48+
testImplementation 'org.springframework:spring-test'
49+
50+
testImplementation 'org.springframework:spring-webmvc'
51+
testImplementation 'jakarta.servlet:jakarta.servlet-api'
52+
testImplementation "org.junit.jupiter:junit-jupiter-api"
53+
testImplementation "org.junit.jupiter:junit-jupiter-params"
54+
testImplementation "org.junit.jupiter:junit-jupiter-engine"
55+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4056
}
4157

4258
def generateAttributes() {
@@ -78,3 +94,16 @@ def resolvedVersions(Configuration configuration) {
7894
.resolvedArtifacts
7995
.collectEntries { [(it.name + '-version'): it.moduleVersion.id.version] }
8096
}
97+
98+
test {
99+
useJUnitPlatform()
100+
}
101+
102+
tasks.withType(KotlinCompile).configureEach {
103+
kotlinOptions {
104+
languageVersion = "1.7"
105+
apiVersion = "1.7"
106+
freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"]
107+
jvmTarget = "17"
108+
}
109+
}

0 commit comments

Comments
 (0)