Skip to content

Commit

Permalink
Merge pull request #298 from balrok/bugfix/fix-kotlin-multiplatform-test
Browse files Browse the repository at this point in the history
Fix kotlin Multiplatform Test: The test requires Java 17 but in our github action we only have 11
  • Loading branch information
jk1 authored May 26, 2024
2 parents bb1231e + 8b85eb5 commit 30f36c1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ licenseReport {
// Set output directory for the report data.
// Defaults to ${project.buildDir}/reports/dependency-license.
outputDir = "$projectDir/build/licenses"
outputDir = project.layout.buildDirectory.dir("licenses").get().asFile.path
// Select projects to examine for dependencies.
// Defaults to current project and all its subprojects
Expand Down Expand Up @@ -84,7 +84,7 @@ licenseReport {
// This is for the allowed-licenses-file in checkLicense Task
// Accepts File, URL or String path to local or remote file
allowedLicensesFile = new File("$projectDir/config/allowed-licenses.json")
allowedLicensesFile = project.layout.projectDirectory.file("config/allowed-licenses.json").asFile
}
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LicenseReportExtension {

LicenseReportExtension(Project project) {
unionParentPomLicenses = true
outputDir = "${project.buildDir}/reports/dependency-license"
outputDir = project.layout.buildDirectory.dir("reports/dependency-license").get().asFile.absolutePath
projects = [project] + project.subprojects
renderers = new SimpleHtmlReportRenderer()
configurations = null
Expand Down Expand Up @@ -76,7 +76,7 @@ class LicenseReportExtension {
if (new File(outputDir).isAbsolute()) {
return outputDir
} else {
return projects.first().absoluteProjectPath(outputDir)
return projects.first().layout.projectDirectory.dir(outputDir).asFile.absolutePath
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ class MultiProjectReaderFuncSpec extends AbstractGradleRunnerFunctionalSpec {
newSubBuildFile("shared") << """
plugins {
id "com.android.library" version "8.1.3"
id "com.android.library" version "7.4.0"
id "org.jetbrains.kotlin.multiplatform" version "1.9.20"
id "com.github.jk1.dependency-license-report"
}
Expand Down Expand Up @@ -629,7 +629,7 @@ class MultiProjectReaderFuncSpec extends AbstractGradleRunnerFunctionalSpec {
newSubBuildFile("android") << """
plugins {
id "com.android.application" version "8.1.3"
id "com.android.application" version "7.4.0"
id "org.jetbrains.kotlin.android" version "1.9.20"
id "com.github.jk1.dependency-license-report"
}
Expand Down

0 comments on commit 30f36c1

Please sign in to comment.