Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecated KotlinJvmOptions #64

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Deprecated KotlinJvmOptions #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e17344
Deprecated KotlinJvmOptions
ksharma-xyz Sep 27, 2024
93ce32d
Kotlin Gradle Plugin: The KotlinJvmOptions class has been replaced by…
ksharma-xyz Sep 27, 2024
253d280
Set jvmTarget value
ksharma-xyz Sep 27, 2024
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
20 changes: 11 additions & 9 deletions ...gic/convention/src/main/kotlin/xyz/ksharma/krail/AndroidLibraryComposeConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import org.gradle.api.JavaVersion
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.plugins.ExtensionAware
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

@Suppress("UNUSED")
class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
Expand Down Expand Up @@ -41,13 +42,14 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
targetCompatibility = JavaVersion.values()[javaVersion - 1]
}

(this as ExtensionAware).configure<KotlinJvmOptions> {
jvmTarget = "$javaVersion"
freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=kotlin.RequiresOptIn",
"-opt-in=kotlinx.coroutines.FlowPreview",
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
)
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)

freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.FlowPreview")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
}
}

buildFeatures {
Expand Down
20 changes: 11 additions & 9 deletions build-logic/convention/src/main/kotlin/xyz/ksharma/krail/AndroidLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import org.gradle.api.JavaVersion
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.plugins.ExtensionAware
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

@Suppress("UNUSED")
class AndroidLibraryConventionPlugin : Plugin<Project> {
Expand Down Expand Up @@ -41,13 +42,14 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
targetCompatibility = JavaVersion.values()[javaVersion - 1]
}

(this as ExtensionAware).configure<KotlinJvmOptions> {
jvmTarget = "$javaVersion"
freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=kotlin.RequiresOptIn",
"-opt-in=kotlinx.coroutines.FlowPreview",
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
)
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)

freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.FlowPreview")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
}
}

buildFeatures {
Expand Down
23 changes: 13 additions & 10 deletions build-logic/convention/src/main/kotlin/xyz/ksharma/krail/ApplicationConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import org.gradle.api.JavaVersion
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.plugins.ExtensionAware
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

@Suppress("UNUSED")
class ApplicationConventionPlugin : Plugin<Project> {
Expand All @@ -18,6 +19,7 @@ class ApplicationConventionPlugin : Plugin<Project> {
val minSdkVersion = libs.findVersion("minSdk").get().toString().toInt()
val targetSdkVersion = libs.findVersion("targetSdk").get().toString().toInt()
val compileSdkVersion = libs.findVersion("compileSdk").get().toString().toInt()
//val composeCompilerVersion = libs.findPlugin("composeCompiler").get().toString()

with(pluginManager) {
apply("com.android.application")
Expand All @@ -40,21 +42,22 @@ class ApplicationConventionPlugin : Plugin<Project> {
targetCompatibility = JavaVersion.values()[javaVersion - 1]
}

(this as ExtensionAware).configure<KotlinJvmOptions> {
jvmTarget = "$javaVersion"
freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=kotlin.RequiresOptIn",
"-opt-in=kotlinx.coroutines.FlowPreview",
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
)
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)

freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.FlowPreview")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
}
}

buildFeatures {
compose = true
buildConfig = true
}

/*composeOptions {
/* composeOptions {
kotlinCompilerExtensionVersion = composeCompilerVersion
}*/

Expand Down
19 changes: 11 additions & 8 deletions build-logic/convention/src/main/kotlin/xyz/ksharma/krail/JvmLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

class JvmLibraryConventionPlugin : Plugin<Project> {
Expand All @@ -25,17 +27,18 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = javaVersion.toString()

compilerOptions {
val warningsAsErrors: String? by project
allWarningsAsErrors = warningsAsErrors.toBoolean()
freeCompilerArgs = freeCompilerArgs + listOf(
// Enable experimental coroutines APIs, including Flow
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
)
allWarningsAsErrors.set(warningsAsErrors.toBoolean())

jvmTarget.set(JvmTarget.JVM_17)

freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.FlowPreview")
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
}
}

}
}
}