-
-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #550 from kotlin-orm/dev
Release 4.0.0
- Loading branch information
Showing
181 changed files
with
5,366 additions
and
281 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
|
|
||
| group = rootProject.group | ||
| version = rootProject.version | ||
|
|
||
| plugins { | ||
| id("kotlin") | ||
| id("org.gradle.jacoco") | ||
| id("io.gitlab.arturbosch.detekt") | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| api(kotlin("stdlib")) | ||
| api(kotlin("reflect")) | ||
| testImplementation(kotlin("test-junit")) | ||
| detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${detekt.toolVersion}") | ||
| } | ||
|
|
||
| detekt { | ||
| source.setFrom("src/main/kotlin") | ||
| config.setFrom("${project.rootDir}/detekt.yml") | ||
| } | ||
|
|
||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| tasks { | ||
| compileKotlin { | ||
| kotlinOptions { | ||
| jvmTarget = "1.8" | ||
| allWarningsAsErrors = true | ||
| freeCompilerArgs = listOf("-Xexplicit-api=strict") | ||
| } | ||
| } | ||
|
|
||
| compileTestKotlin { | ||
| kotlinOptions { | ||
| jvmTarget = "1.8" | ||
| } | ||
| } | ||
|
|
||
| jacocoTestReport { | ||
| reports { | ||
| csv.required.set(true) | ||
| xml.required.set(true) | ||
| html.required.set(true) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
|
|
||
| plugins { | ||
| id("kotlin") | ||
| id("org.moditect.gradleplugin") | ||
| } | ||
|
|
||
| moditect { | ||
| // Generate a multi-release jar, the module descriptor will be located at META-INF/versions/9/module-info.class | ||
| addMainModuleInfo { | ||
| jvmVersion.set("9") | ||
| overwriteExistingFiles.set(true) | ||
| module { | ||
| moduleInfoFile = file("src/main/moditect/module-info.java") | ||
| } | ||
| } | ||
|
|
||
| // Let kotlin compiler know the module descriptor. | ||
| if (JavaVersion.current() >= JavaVersion.VERSION_1_9) { | ||
| sourceSets.main { | ||
| kotlin.srcDir("src/main/moditect") | ||
| } | ||
| } | ||
|
|
||
| // Workaround to avoid circular task dependencies, see https://github.com/moditect/moditect-gradle-plugin/issues/14 | ||
| afterEvaluate { | ||
| val compileJava = tasks.compileJava.get() | ||
| val addDependenciesModuleInfo = tasks.addDependenciesModuleInfo.get() | ||
| compileJava.setDependsOn(compileJava.dependsOn - addDependenciesModuleInfo) | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Oops, something went wrong.