diff --git a/build.gradle.kts b/build.gradle.kts index 212a0b1..a1ea898 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,10 +107,16 @@ licenseReport { // Apache 2.0 "com.github.ajalt.clikt:clikt", + "com.github.ajalt.mordant:mordant", + + // MIT + "com.github.ajalt.colormath:colormath", + "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains.kotlinx:kotlinx-serialization-bom", "org.jetbrains.kotlinx:kotlinx-serialization-core", "org.jetbrains.kotlinx:kotlinx-serialization-json", + "org.jetbrains:markdown", ).toTypedArray() } diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts index 1e69bc6..1af7c5b 100644 --- a/cli/build.gradle.kts +++ b/cli/build.gradle.kts @@ -22,7 +22,7 @@ plugins { id("com.github.johnrengelman.shadow").version("8.1.1") } dependencies { - implementation("com.github.ajalt.clikt:clikt:3.2.0") + implementation("com.github.ajalt.clikt:clikt:4.2.2") testImplementation("io.mockk:mockk:1.13.9") implementation(project(":api")) diff --git a/cli/src/test/kotlin/com/google/prefab/cli/ArgParserTest.kt b/cli/src/test/kotlin/com/google/prefab/cli/ArgParserTest.kt index fa23ed0..f5806e4 100644 --- a/cli/src/test/kotlin/com/google/prefab/cli/ArgParserTest.kt +++ b/cli/src/test/kotlin/com/google/prefab/cli/ArgParserTest.kt @@ -55,6 +55,9 @@ class ArgParserTest(override val schemaVersion: SchemaVersion) : PerSchemaTest { NoRunTestCli().parse( listOf( "--platform", "android", + "--os-version", "21", + "--ndk-version", "26", + "--stl", "c++_shared", "--output", "out", fooPath.toString() @@ -70,6 +73,9 @@ class ArgParserTest(override val schemaVersion: SchemaVersion) : PerSchemaTest { listOf( "--platform", "android", "--build-system", "ndk-build", + "--os-version", "21", + "--ndk-version", "26", + "--stl", "c++_shared", fooPath.toString() ) ) @@ -83,6 +89,9 @@ class ArgParserTest(override val schemaVersion: SchemaVersion) : PerSchemaTest { listOf( "--platform", "android", "--build-system", "ndk-build", + "--os-version", "21", + "--ndk-version", "26", + "--stl", "c++_shared", "--output", file.path, fooPath.toString() ) diff --git a/config/allowed_licenses.json b/config/allowed_licenses.json index 0fe0be1..e1b3439 100644 --- a/config/allowed_licenses.json +++ b/config/allowed_licenses.json @@ -8,6 +8,12 @@ }, { "moduleLicense": "The Apache Software License, Version 2.0" + }, + { + "moduleLicense": "The MIT License" + }, + { + "moduleLicense": "Apache License, Version 2.0" } ] }