Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ gradle-app.setting

# Ignore Gradle build output directory
build

# IDEA
.idea/
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
23 changes: 12 additions & 11 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
`java-gradle-plugin`
`kotlin-dsl`
`maven-publish`
id("com.gradle.plugin-publish")
id("com.gradle.plugin-publish") version "2.0.0"
}

version = file("version.txt").useLines { it.first() }
Expand All @@ -20,22 +20,23 @@ gradlePlugin {
}
}

pluginBundle {
website = "https://github.com/LouisCAD/CompleteKotlin"
vcsUrl = "https://github.com/LouisCAD/CompleteKotlin.git"
tags = listOf("kotlin", "kotlin-multiplatform", "kmm", "plugins")
}
//pluginBundle {
// website = "https://github.com/LouisCAD/CompleteKotlin"
// vcsUrl = "https://github.com/LouisCAD/CompleteKotlin.git"
// tags = listOf("kotlin", "kotlin-multiplatform", "kmm", "plugins")
//}

repositories { mavenCentral() }

dependencies {
implementation(gradleKotlinDsl())
testImplementation(Kotlin.test.junit5)
implementation(kotlin("gradle-plugin", "2.3.0"))
testImplementation(kotlin("test-junit5"))
}

tasks.withType<KotlinJvmCompile>().configureEach {
kotlinOptions.apiVersion = "1.4"
kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
compilerOptions {
freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
}
}

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ internal fun Project.completePlatformKlibsIfNeeded() {

targets.all {
val presetName = (this.javaClass.kotlin.memberProperties.first {
it.name == "preset"
}.call(this) as Named).name
it.name == "disambiguationClassifier"
}.call(this) as String)
when (val platform = exclusiveHostPlatform(presetName = presetName)) {
HostPlatform.current, null -> return@all
else -> {
Expand Down
2 changes: 1 addition & 1 deletion plugin/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1
2 changes: 1 addition & 1 deletion sample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("multiplatform") version "1.5.32"
kotlin("multiplatform") version "2.3.0"
id("com.louiscad.complete-kotlin")
}

Expand Down
4 changes: 0 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
plugins {
id("de.fayard.refreshVersions") version "0.30.2"
}

rootProject.name = "CompleteKotlin"
include("plugin")
4 changes: 2 additions & 2 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.30.2
#### Generated by `./gradlew refreshVersions` version 0.60.6
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
Expand All @@ -9,7 +9,7 @@

plugin.com.gradle.plugin-publish=0.19.0

version.kotlin=1.5.32
version.kotlin=2.3.0
## # available=1.6.0-M1
## # available=1.6.0-RC
## # available=1.6.0-RC2
Expand Down