Skip to content

Commit

Permalink
WIP: Kotlin 1.5 with necessary dokka upgrade (#2055)
Browse files Browse the repository at this point in the history
* Upgrade mvn publish pluging; fix dokka setup for change

* Attempt to get dokkaGfm to work properly - OOM/Metaspace problem, see: Kotlin/dokka#1405

* Upgrade to Kotlin 1.5

* Upgrade to kotlin 1.5; fix misk-admin config; use --no-daemon --> still OOM/Metaspace :(

* Do Dokka tasks in separate daemons and separate modules; reduce memeory required

* Remove non-existent dir call

* Only do the publish docs when building master
  • Loading branch information
chris-ryan-square committed Jul 20, 2021
1 parent 37b4fcc commit 2f70e00
Show file tree
Hide file tree
Showing 14 changed files with 4 additions and 95 deletions.
7 changes: 0 additions & 7 deletions wisp/wisp-aws-environment/build.gradle.kts
Expand Up @@ -9,11 +9,4 @@ dependencies {

}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-client/build.gradle.kts
Expand Up @@ -20,11 +20,4 @@ dependencies {
implementation(Dependencies.retrofitWire)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-config/build.gradle.kts
Expand Up @@ -11,11 +11,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
Expand Up @@ -107,8 +107,8 @@ internal class WispConfigTest {
assertEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY.value)

// values should me masked
assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.aws.AWS_ACCESS_KEY_ID)
assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY)
assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.aws.AWS_ACCESS_KEY_ID.toString())
assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY.toString())
}

@Test
Expand All @@ -125,8 +125,8 @@ internal class WispConfigTest {
assertEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY.value)

// values should me masked
assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.AWS_ACCESS_KEY_ID)
assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY)
assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.AWS_ACCESS_KEY_ID.toString())
assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY.toString())
}

// TODO(chrisryan): add tests to support other formats
Expand Down
7 changes: 0 additions & 7 deletions wisp/wisp-containers-testing/build.gradle.kts
Expand Up @@ -13,11 +13,4 @@ dependencies {
api(project(":wisp-logging"))
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-deployment-testing/build.gradle.kts
Expand Up @@ -6,11 +6,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-deployment/build.gradle.kts
Expand Up @@ -6,11 +6,4 @@ dependencies {
testImplementation(project(":wisp-deployment-testing"))
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-feature-testing/build.gradle.kts
Expand Up @@ -16,11 +16,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-feature/build.gradle.kts
Expand Up @@ -4,11 +4,4 @@ dependencies {
implementation(Dependencies.loggingApi)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-logging-testing/build.gradle.kts
Expand Up @@ -11,11 +11,4 @@ dependencies {
testImplementation(project(":wisp-logging"))
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-logging/build.gradle.kts
Expand Up @@ -11,11 +11,4 @@ dependencies {
testImplementation(project(":wisp-logging-testing"))
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-resource-loader-testing/build.gradle.kts
Expand Up @@ -10,11 +10,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-resource-loader/build.gradle.kts
Expand Up @@ -9,11 +9,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")
7 changes: 0 additions & 7 deletions wisp/wisp-ssl/build.gradle.kts
Expand Up @@ -10,11 +10,4 @@ dependencies {
testImplementation(Dependencies.kotlinTest)
}

afterEvaluate {
project.tasks.dokka {
outputDirectory = "$rootDir/docs/0.x"
outputFormat = "gfm"
}
}

apply(from = "$rootDir/gradle-mvn-publish.gradle")

0 comments on commit 2f70e00

Please sign in to comment.