079a123536
[build][jar-collision] added META-INF/compiler.common.jvm.kotlin_module
2020-09-07 22:21:20 +02:00
bc3b4f3954
Fix module name in jar collision list
...
(cherry picked from commit a34ad4cb66318c7c26d7412104c7d69f56dbf074)
2020-09-07 22:21:20 +02:00
0866c9c468
Update modules list for jar collision detection
...
(cherry picked from commit 69753529e9e3ca7388132cfab90138c4b49eb945)
2020-09-07 22:21:20 +02:00
f70d300f77
[build][jar-collision] added META-INF/compiler.common.kotlin_module
2020-08-31 19:37:35 +02:00
b2fbe0135f
Add new Kotlin modules ir.tree.impl, ir.tree.persisting
...
(cherry picked from commit b54cf042acbeed7ea1ab0fa79ccf0e11f3f1ddbb)
2020-08-03 15:53:43 +02:00
377b676eaa
Add ir.interpreter to libraries with ignored collisions
...
(cherry picked from commit 13035ebf975ad5ab68134c086ad436b6abff9d27)
2020-06-29 12:06:14 +02:00
f959f275e8
[build] Create a separate utility module for basic things
...
The :utilities module contains some logic that depends on all
other parts of the K/N toolchain. But we also need a module
containing a basic logic that all other parts of the toolchain
depends on. Historically such logic is located in the :shared
module. However having code with complex dependencies in :shared
may slow down a composite build import.
So this patch puts all content of :utilities into a new module
:utilities:cli-runner and creates a new :utilities:basic-utils
module. Later some logic from the :shared module may be moved
into this new module.
2020-05-20 19:52:35 +07:00
2629c44a34
Exclude module-info descriptor from standard library artifacts
...
There's a conflict between kotlin-stdlib and kotlin-reflect, and
that descriptor is anyway not needed when running merged jar
on a classpath.
(cherry picked from commit 2b0f99aea8b3cbb6669ecc63017bee7c379c8b9c)
2020-05-19 10:16:15 +02:00
37bf7d7ef9
[Interop][Tests] Add infrastructure to test klib metadata ( #4134 )
...
We need a structural testing tool for interop metadata itself because it is not always possible to detect metadata errors via usual compiler tests.
2020-05-18 15:03:31 +07:00
0a3b42d649
Save trove4j as separate jar ( #4168 )
2020-05-13 10:33:30 +03:00
52e3e259d0
Add fir-serialization to libraries with ignored collisions
...
(cherry picked from commit f67796558b48f75afadd9c1871ca20f855ceafb8)
2020-05-06 16:26:14 +02:00
3a41617160
Generate compdb for all targets ( #4149 )
2020-05-06 13:53:10 +03:00
ffe2fcf7c2
Adding CompilationDatabase generation ( #4091 )
2020-04-22 17:45:37 +03:00
bf9c66e275
KLIB: Merge manifest for stdlib produced for different targets
...
(cherry picked from commit b7f12c9ae64f8a4a0785105a53f118083e660386)
2020-04-15 10:22:27 +02:00
2f32d37840
Drop useless :commonDistRuntime Gradle task
...
Reasons:
1. This task does not depend on anything. So, Gradle typically runs it somewhere in the very beginning of the build when the artifacts that this task is supposed to copy are not yet built.
2. This task is always used in conjunction with ":${target}CrossDistRuntime", which has all the necessary dependencies and does everything what :commonDistRuntime is supposed to do plus some additional work.
2020-04-06 17:48:46 +07:00
76c91c589f
[build][collision] added META-INF/kotlin-native-utils.kotlin_module
2020-04-02 09:29:38 +02:00
d3c175a152
Don't include kotlin-native-utils.jar into fat kotlin-native.jar
...
(cherry picked from commit c23811b602a5889afa673728eadec570a1ff7566)
2020-04-02 09:29:38 +02:00
8f9c34c646
Add new compiler modules to detectJarCollision exclusion
...
(cherry picked from commit de9d43770aa4868e32be9a9c901f66aad319c393)
2020-03-30 16:06:39 +02:00
d9fa01d3b7
Fix collision error after raw-fir:common -> raw-fir:fir-common rename
2020-03-28 20:42:55 +07:00
712d6d90fb
Add common and light-tree2fir modules to collision detector ignore
2020-03-28 20:42:55 +07:00
88a65e3205
Drop extracted/konan.serializer module
2020-03-27 12:44:09 +07:00
bbc979fce0
Drop extracted/konan.metadata module
2020-03-27 12:44:09 +07:00
3334b9b3ad
[Platform libs] Store def files in distribution on per-target basis
2020-03-26 17:00:47 +07:00
c3a4867eeb
Add checkers to class collision ignores
...
(cherry picked from commit 23dc77402427c2e38247ee25ade406f722d3942d)
2020-03-23 13:44:12 +01:00
bbfde042e9
Add compiler.version to libraries with ignored class collisions ( #3945 )
...
(cherry picked from commit ad8aa9b1b116584fd4b85438a52527d50443acd9)
2020-03-12 13:42:05 +01:00
3546ad5e72
Added one more resolving rules for composite build
...
(cherry picked from commit 9664abc05c1b7c2480935527a7c1e2c740d12028)
2020-03-12 13:42:05 +01:00
be8622053e
build: Build stdlib cache as a part of dist/cross_dist
2020-03-06 13:24:20 +07:00
764be2f461
Add prebuilt distribution type
...
Since platform libraries can now be generated at the use side,
we need to:
a) remove them from a default distribution
b) drop the restricted distribution
But we still need a distribution with prebuilt libraries to be
able to workaround problems with platform libraries generator.
This patch removes libraries from a default distribution and
adds a distribution type with pretuilt libraries.
2020-03-06 13:24:20 +07:00
3af8564bf6
Platform libs: Improve library generator
...
- Support concurrent execution
- Provide default values for parameter
- Skip existing libraries/caches
- Improve logging
2020-03-06 13:24:20 +07:00
a3fdca0ea3
Revert "[stdlib][common][coroutines][experimental] support of extracted old experimental coroutines code"
...
This reverts commit 0ffcfa4ef1
2020-02-07 07:07:30 +01:00
acfc759b89
[build][colision detection] another bunch of conflicts
2020-02-05 14:30:36 +01:00
0ffcfa4ef1
[stdlib][common][coroutines][experimental] support of extracted old experimental coroutines code
...
see b5a0daabc3
2020-02-05 14:30:36 +01:00
59e71018da
Remove defaultTasks to fix IDEA-231214 issue that make these tasks be build during project import
2020-01-29 19:37:27 +03:00
19e706b1a3
Properly construct stdlib with components.
...
(cherry picked from commit 49ac790fcf1fc4dd590f79d1b591e7599f3c0ca3)
2020-01-28 20:11:28 +01:00
b4882103bc
Initial implementation of klib components.
...
(cherry picked from commit e1db35b825dabc5eb8f48a24fe6a46b0a0e87714)
2020-01-28 20:11:28 +01:00
b05ddd4b4a
Keep Kotlin/Native version in konan/konan.properties file
2020-01-23 15:55:40 +07:00
86643c7396
Exclude Xcode license from the restricted build
...
Also fix excluding cache files.
2020-01-18 12:17:27 +07:00
3363c95c23
Do not use zipTree in CollisionDetector task
...
This avoids unpacking all the dependency jars and significantly speeds up the task.
2020-01-09 23:48:20 +03:00
9ab9716a2f
Composite build. One more jar added in the latest changes in Kotlin ( #3736 )
2019-12-30 12:21:35 +03:00
653fb865c2
Build: Don't generate caches for iOS devices
2019-12-26 18:02:41 +07:00
b78c7b5f4e
Don't include platform lib caches into the restricted distribution
2019-12-21 18:11:31 +03:00
33774cbf77
Platform libs: Generate static cache
...
The following targets are supported:
macos_x64
ios_x64
ios_arm64
ios_arm32
2019-12-20 18:27:02 +03:00
2e22d5a389
[Interop] Add dependency on kotlinx-metadata-klib
2019-12-03 17:23:39 +07:00
f36a066f4d
Exclude lightTree from collision detection
...
(cherry picked from commit a9fb40dcd5774ba5d26d98cb0680d0f76ba51b15)
2019-12-02 15:23:00 +01:00
fcba683e72
A native counterpart for plubing metadata and ir versions to klib manifest
...
(cherry picked from commit 06a515393df6c1c071a551353a2a82fd2252a24c)
2019-12-02 15:23:00 +01:00
40715826ad
Adapt to change in ExternalDependenciesGenerator
2019-11-28 10:24:15 +03:00
750b62b112
Update Gradle: 6.0.1
2019-11-28 12:20:29 +07:00
296d4e72e8
Restricted build fixes.
2019-11-12 01:17:19 +03:00
9011151186
Typo in restricted exclude.
2019-11-08 22:26:43 +03:00
d138ad1a0d
Properly ignore targets in restricted build. ( #3559 )
2019-11-08 19:37:26 +03:00
Vasily Levchenko