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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ dependencies {

gradlePlugin {
plugins {
register("valkyrie.jvm") {
id = "valkyrie.jvm"
implementationClass = "JvmPlugin"
}
register("valkyrie.kmp") {
id = "valkyrie.kmp"
implementationClass = "KmpPlugin"
Expand Down
26 changes: 26 additions & 0 deletions build-logic/convention/src/main/kotlin/JvmPlugin.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

import io.github.composegears.valkyrie.internal.configureArchiveBaseName
import io.github.composegears.valkyrie.internal.kotlinJvmPluginId
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.dsl.DependencyHandler
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.kotlin

class JvmPlugin : Plugin<Project> {

override fun apply(target: Project) = with(target) {
apply(plugin = kotlinJvmPluginId)

dependencies {
compileOnly(kotlin("stdlib"))
}

configureArchiveBaseName()
}
}

private fun DependencyHandler.`compileOnly`(dependencyNotation: Any): Dependency? =
add("compileOnly", dependencyNotation)
13 changes: 13 additions & 0 deletions build-logic/convention/src/main/kotlin/KmpPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import io.github.composegears.valkyrie.extension.applyTargets
import io.github.composegears.valkyrie.internal.configureArchiveBaseName
import io.github.composegears.valkyrie.internal.kmpExtension
import io.github.composegears.valkyrie.internal.kotlinMultiplatformPluginId
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.invoke

class KmpPlugin : Plugin<Project> {

Expand All @@ -17,6 +19,17 @@ class KmpPlugin : Plugin<Project> {
extraWarnings.set(true)
freeCompilerArgs.add("-Xexpect-actual-classes")
}

sourceSets {
commonMain.dependencies {
compileOnly(kotlin("stdlib"))
}
wasmJsMain.dependencies {
api(kotlin("stdlib"))
}
}
}

configureArchiveBaseName()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package io.github.composegears.valkyrie.internal

import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
import org.gradle.api.Project
import org.gradle.api.tasks.bundling.Jar
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
Expand All @@ -26,3 +28,15 @@ internal fun Project.composeCompiler(block: ComposeCompilerGradlePluginExtension

internal fun Project.kover(action: KoverProjectExtension.() -> Unit) =
extensions.configure<KoverProjectExtension>(action)

internal fun Project.configureArchiveBaseName() {
tasks.withType<Jar>().configureEach {
val pathSegments = project.path
.removePrefix(":")
.split(":")
.filter { it.isNotEmpty() }
val name = pathSegments.joinToString("-")

archiveBaseName.set("valkyrie-$name")
}
}

This file was deleted.

11 changes: 10 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,24 @@ allprojects {
}
}
mavenCentral()
maven("https://www.jetbrains.com/intellij-repository/releases")
maven("https://www.jetbrains.com/intellij-repository/snapshots")
maven("https://cache-redirector.jetbrains.com/intellij-dependencies")

intellijPlatform {
defaultRepositories()
}
}
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
dependencies {
extensions.configure<IntelliJPlatformDependenciesExtension> {
intellijIdeaCommunity("2024.3")
// https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
intellijIdea("2025.3")

bundledPlugin("org.jetbrains.kotlin")

// https://github.com/JetBrains/intellij-platform-compose-plugin-template
composeUI()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/generator/jvm/imagevector/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.valkyrie.abi)
alias(libs.plugins.valkyrie.jvm)
alias(libs.plugins.valkyrie.kover)
}

Expand Down
2 changes: 1 addition & 1 deletion components/generator/jvm/poet-extensions/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.valkyrie.abi)
alias(libs.plugins.valkyrie.jvm)
alias(libs.plugins.valkyrie.kover)
}

Expand Down
2 changes: 1 addition & 1 deletion components/parser/jvm/svg/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.valkyrie.abi)
alias(libs.plugins.valkyrie.jvm)
alias(libs.plugins.valkyrie.kover)
}

Expand Down
10 changes: 4 additions & 6 deletions components/parser/jvm/xml/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.valkyrie.abi)
alias(libs.plugins.valkyrie.jvm)
alias(libs.plugins.valkyrie.kover)
}

dependencies {
implementation(projects.components.parser.common)
implementation(projects.sdk.ir.core)
implementation(libs.xpp3)
}

tasks.withType<Jar>().configureEach {
archiveBaseName = "parser-jvm-xml"
implementation(libs.xpp3) {
exclude(group = "junit", module = "junit")
}
}
4 changes: 0 additions & 4 deletions components/parser/kmp/xml/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@ kotlin {
}
}
}

tasks.withType<Jar>().configureEach {
archiveBaseName = "parser-kmp-xml"
}
46 changes: 4 additions & 42 deletions compose/icons/api/icons.api
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ public final class io/github/composegears/valkyrie/compose/icons/ValkyrieIcons$C
public static final field INSTANCE Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Colored;
}

public final class io/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Filled {
public static final field $stable I
public static final field INSTANCE Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Filled;
}

public final class io/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea {
public static final field $stable I
public static final field INSTANCE Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea;
}

public final class io/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined {
public static final field $stable I
public static final field INSTANCE Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;
Expand All @@ -31,34 +21,14 @@ public final class io/github/composegears/valkyrie/compose/icons/colored/PluginI
public static final fun getValkyrieLogo (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Colored;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/filled/HelpKt {
public static final fun getHelp (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/idea/AddFileDarkKt {
public static final fun getAddFileDark (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/idea/AddFileKt {
public static final fun getAddFile (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/idea/NotificationsKt {
public static final fun getNotifications (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/idea/SettingsKt {
public static final fun getSettings (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Idea;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/ArrowDownKt {
public static final fun getArrowDown (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/BackKt {
public static final fun getBack (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/BatchProcessingKt {
public static final fun getBatchProcessing (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/ConversionKt {
public static final fun getConversion (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}
Expand Down Expand Up @@ -87,15 +57,7 @@ public final class io/github/composegears/valkyrie/compose/icons/outlined/LightK
public static final fun getLight (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/SearchKt {
public static final fun getSearch (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/SettingsKt {
public static final fun getSettings (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

public final class io/github/composegears/valkyrie/compose/icons/outlined/TuneKt {
public static final fun getTune (Lio/github/composegears/valkyrie/compose/icons/ValkyrieIcons$Outlined;)Landroidx/compose/ui/graphics/vector/ImageVector;
}

Loading