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.

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

Kotlin rewrite #982

Draft
wants to merge 79 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
988e611
Apply Kotlin JVM plugin
Goooler Sep 19, 2024
c6ea68f
Convert ShadowSpec
Goooler Sep 19, 2024
6a392c8
Declare compilerOptions.jvmTarget
Goooler Sep 19, 2024
dcdf561
Rename params to action
Goooler Sep 19, 2024
5979229
Convert Relocator
Goooler Sep 19, 2024
f718533
Convert CacheableRelocator
Goooler Sep 19, 2024
8fddef4
Convert RelocateClassContext
Goooler Sep 19, 2024
678472d
Convert RelocatePathContext
Goooler Sep 19, 2024
41d7803
Convert LegacyShadowPlugin
Goooler Sep 19, 2024
90c79f8
Convert InheritManifest
Goooler Sep 19, 2024
343805f
Convert KnowsTask
Goooler Sep 19, 2024
09add8d
Convert Transformer
Goooler Sep 19, 2024
aac5e87
Convert ShadowExtension
Goooler Sep 19, 2024
72a7fd7
Convert ShadowBasePlugin
Goooler Sep 19, 2024
aaacaf2
Remove configureBuildScan
Goooler Sep 19, 2024
dd98267
Convert ShadowPlugin
Goooler Sep 19, 2024
70c3763
Convert ShadowStats
Goooler Sep 19, 2024
56cca30
Convert CleanProperties
Goooler Sep 19, 2024
a7522e3
Convert DefaultZipCompressor
Goooler Sep 19, 2024
0a94723
Convert DefaultDependencyFilter
Goooler Sep 19, 2024
91005fe
Convert DependencyFilter
Goooler Sep 19, 2024
834ff6e
Convert JavaJarExec
Goooler Sep 19, 2024
6728b96
Convert ZipCompressor
Goooler Sep 19, 2024
30628c6
Convert RelocationUtil
Goooler Sep 19, 2024
77fe0ef
Optimize configureRelocation
Goooler Sep 19, 2024
fa76231
Cleanups
Goooler Sep 19, 2024
ce6d079
Convert GradleVersionUtil
Goooler Sep 19, 2024
73fb1fe
Convert MinimizeDependencyFilter
Goooler Sep 19, 2024
3e6b926
Convert RelocatorRemapper
Goooler Sep 19, 2024
de55af8
Convert DefaultInheritManifest
Goooler Sep 19, 2024
24ad968
Convert UnusedTracker
Goooler Sep 19, 2024
0412804
Convert UnusedTracker
Goooler Sep 19, 2024
46b4b3f
Convert ApacheLicenseResourceTransformer
Goooler Sep 19, 2024
1b7ff30
Convert AppendingTransformer
Goooler Sep 19, 2024
8ffdfc1
Rename TransformerContext.is
Goooler Sep 19, 2024
edb6f88
Convert TransformerContext
Goooler Sep 19, 2024
de15761
Convert CacheableTransformer
Goooler Sep 19, 2024
d81666b
Convert DontIncludeResourceTransformer
Goooler Sep 19, 2024
4dc9312
Add NoOpTransformer
Goooler Sep 19, 2024
cee4fa5
Fix AppendingTransformer
Goooler Sep 19, 2024
982d6e0
Convert IncludeResourceTransformer
Goooler Sep 20, 2024
5226a4b
Convert ShadowJavaPlugin
Goooler Sep 20, 2024
3b7832c
Convert AbstractDependencyFilter
Goooler Sep 20, 2024
fa47492
Convert ShadowApplicationPlugin
Goooler Sep 20, 2024
4054823
Convert XmlAppendingTransformer
Goooler Sep 21, 2024
352c01a
Convert ManifestResourceTransformer
Goooler Sep 21, 2024
fe01bb0
Convert ManifestAppenderTransformer
Goooler Sep 21, 2024
5b1d81c
Convert Log4j2PluginsCacheFileTransformer
Goooler Sep 21, 2024
f57182a
Convert GroovyExtensionModuleTransformer
Goooler Sep 21, 2024
6d9e47f
Convert ApacheNoticeResourceTransformer
Goooler Sep 22, 2024
681ab53
Convert ComponentsXmlResourceTransformer
Goooler Sep 22, 2024
fbeb245
Convert PropertiesFileTransformer
Goooler Sep 22, 2024
65e46b4
Convert ServiceFileTransformer
Goooler Sep 22, 2024
7115172
Convert ShadowJar
Goooler Sep 22, 2024
7c6c1c6
Convert SimpleRelocator
Goooler Sep 22, 2024
db52f85
Convert ShadowCopyAction
Goooler Sep 22, 2024
757e151
Remove withSourcesJar and withJavadocJar
Goooler Sep 22, 2024
2816c2a
Fix APIs
Goooler Sep 22, 2024
3d1042c
Reformat
Goooler Sep 22, 2024
5c73474
Remove license headers
Goooler Sep 22, 2024
4222b6c
Cleanups
Goooler Sep 22, 2024
b01885f
Apply Spotless check for build-logic
Goooler Sep 22, 2024
4e3bc46
Merge branch 'main' into kotlin-rewrite
Goooler Sep 22, 2024
baa80a3
Set up BCV
Goooler Sep 22, 2024
abc8a8d
Set up japicmp
Goooler Sep 22, 2024
7b24f7c
Revert "Set up japicmp"
Goooler Sep 22, 2024
c81be9f
Ignore build-logic/build/**
Goooler Sep 22, 2024
92460f3
Fix
Goooler Sep 22, 2024
4e33b20
Merge remote-tracking branch 'origin/main' into kotlin-rewrite
Goooler Sep 24, 2024
748020c
Remove extra indent_size in .editorconfig
Goooler Sep 24, 2024
6616c53
Cleanups
Goooler Sep 24, 2024
7aeb49a
Enable explicitApi
Goooler Sep 24, 2024
7dc3429
Apply indent_size 4
Goooler Oct 2, 2024
1da2c03
Merge branch 'main' into kotlin-rewrite
Goooler Oct 2, 2024
dbeaf6f
Revert "Apply indent_size 4"
Goooler Oct 2, 2024
1a7ff54
Merge remote-tracking branch 'origin/main' into kotlin-rewrite
Goooler Oct 2, 2024
a7889a9
Use JvmTarget.JVM_11
Goooler Oct 2, 2024
6c394e0
Pin apiVersion on 1.8
Goooler Oct 2, 2024
f05644e
Still declare java block
Goooler Oct 2, 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
3 changes: 0 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{groovy,java}]
indent_size = 4

[*.{kt,kts}]
ij_kotlin_imports_layout = *
ij_kotlin_allow_trailing_comma = true
Expand Down
550 changes: 550 additions & 0 deletions api/shadow.api

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ version = providers.gradleProperty("VERSION_NAME").get()
group = providers.gradleProperty("GROUP").get()
description = providers.gradleProperty("POM_DESCRIPTION").get()

java {
withSourcesJar()
withJavadocJar()
}

gradlePlugin {
website = providers.gradleProperty("POM_URL")
vcsUrl = providers.gradleProperty("POM_URL")
Expand Down
17 changes: 17 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
kotlin("jvm") version "2.0.20"
groovy
`java-gradle-plugin`
id("shadow.convention.publish")
id("shadow.convention.deploy")
id("com.diffplug.spotless") version "7.0.0.BETA2"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3"
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlin {
explicitApi()
compilerOptions {
// https://docs.gradle.org/current/userguide/compatibility.html#kotlin
apiVersion = KotlinVersion.KOTLIN_1_8
jvmTarget = JvmTarget.JVM_11
}
}

spotless {
kotlin {
ktlint()
}
kotlinGradle {
ktlint()
target("**/*.kts")
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading