azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,906 Commits 1 Branch 0 Tags
f5cd8c7e4d86c8a0606ae3a7eb60bccb6032fc09
Commit Graph

1915 Commits

Author SHA1 Message Date
Alexander Udalov 55468735df Rename -module argument to -Xbuild-file 
To prevent confusion with Java 9 module-related arguments

 #KT-18754 Fixed
 2017-07-06 17:03:25 +03:00
Sergey Igushkin c4e7f1aa97 Fix parsing Gradle version with zero 
(cherry picked from commit 732972c)
 2017-06-30 20:44:59 +03:00
Sergey Igushkin 40a8bbf24d Fix friend paths not configured correctly with separate classes dirs 
(cherry picked from commit d5ee659)
 2017-06-30 20:44:49 +03:00
Sergey Igushkin 1174c7bdd9 Add sourcesJar and javadocJar to artifacts of gradle-tools projects. 
(cherry picked from commit 450345b)
 2017-06-29 20:59:36 +03:00
Sergey Igushkin a4be282074 Add Gradle Plugin Portal publication to the buildscripts 
Add option to disable signing (-PnoSign), to be used when publishing
pre-built artifacts

Add option to define specific version for publishing, to be used when
publishing test versions

(cherry picked from commit dcd55e9)
 2017-06-29 20:59:36 +03:00
Sergey Igushkin d1bddb6250 Fix disabling IC not applied to kapgGenerateStubsKotlin tasks 
Issue #KT-18647 Fixed

(cherry picked from commit ffb656a)
 2017-06-29 18:44:00 +03:00
Sergey Igushkin a9cad7f112 Add a test for project.buildDir lazy evaluation 
(cherry picked from commit ab0f9cd)
 2017-06-29 18:42:50 +03:00
Nikita Skvortsov b2cdb0d63d evaluate and use buildDir as late as possible 
(cherry picked from commit a2c7f80)

(cherry picked from commit 5643fa1)
 2017-06-29 18:41:53 +03:00
Sergey Igushkin 351f810797 Add tests for separate classes dirs 
(cherry picked from commit b07d79b)
 2017-06-29 18:31:53 +03:00
Sergey Igushkin 700b162233 Implemented separate classes dirs support in the Gradle plugins. 
Issue #KT-18495 Fixed
Issue #KT-18544 Fixed

(cherry picked from commit e25f0fd)
 2017-06-29 18:31:23 +03:00
Sergey Igushkin ae47c59dc9 Pass freeCompilerArgs unchanged to the compiler, without parsing them 
with the compiler loaded along the Gradle plugin.

Issues: #KT-17618 Fixed

(cherry picked from commit 44f7428)
 2017-06-29 18:27:18 +03:00
Alexey Andreev 479148f7e0 Run JS DCE gradle task in a separate process 2017-06-29 10:32:30 +03:00
Alexey Andreev cfbb9209a7 Add JS DCE gradle plugin 2017-06-29 10:32:30 +03:00
Alexey Andreev a0e1bde594 Allow to embed source files into JS source maps 2017-06-26 18:15:28 +03:00
Alexander Udalov a064b59a7d Do not put "Class-Path: kotlin-stdlib.jar" into kotlin-reflect manifest 
Since the kotlin-reflect artifact might be used in environments where
the kotlin-stdlib artifact is named something else (e.g.
kotlin-stdlib-{version}.jar) and the file existence is verified by the
launcher

 #KT-16399 Fixed
 2017-06-22 00:08:38 +03:00
Alexey Andreev 60dd475493 Don't expose sourceMapSourceRoots argument to Gradle (JS) 
Exposing this property causes IDEA to treat it as a free
command line argument, which is undesirable.
Support source roots via setting command line arguments inside
JS gradle task.
 2017-06-20 17:40:35 +03:00
Alexey Andreev 49b742ab3d Add new JS source map config options to Maven plugin 2017-06-20 17:40:35 +03:00
Alexey Andreev cfd3b137d8 Add support for JS source map source roots to Gradle plugin 2017-06-20 17:40:34 +03:00
Alexey Andreev 13ab63ae09 Generate relative paths in JS source maps 
Also, add CLI options to manipulate prefixes of path

See KT-4078
 2017-06-20 17:40:32 +03:00
Yan Zhulanow d07fd52c43 SamWithReceiver: Add general-purpose plugin and Gradle/Maven integrations 2017-06-19 20:28:47 +03:00
Sergey Igushkin 0032719ab9 (minor) Bump Android Gradle plugin version to 3.0.0-alpha4 in tests 2017-06-19 14:37:02 +03:00
Sergey Igushkin 0453c4a7bf Fix Android SDK licenses not being accepted in Kapt3AndroidIT 
(cherry picked from commit 8084ac6)
 2017-06-09 16:38:09 +03:00
Alexander Udalov fb520e3040 Maven: do not set JVM target to null 
After a236400, it's expected that the value of jvmTarget should not be
null. Otherwise ArgumentUtils.convertArgumentsToStringList fails with
NPE
 2017-06-06 19:52:04 +03:00
Sergey Igushkin 2cad64881d (minor) Improve exception message in case no Android plugin was found 2017-06-06 17:21:20 +03:00
Sergey Igushkin 21b88995ab Add tests for the introduced fixes 
Add a test for applying kotlin-android plugin with com.android.feature

Add a test for Databinding (not passing yet with 3.0.0+, until
3.0.0-alpha4 is released, which contains the fix from the Android side).

Add missing test project android-databinding.

Refactor and improve the tests

* Remove redundant files from test project 'android-databinding'
* Refactoring and minor improvements in the tests
 2017-06-06 17:21:20 +03:00
Sergey Igushkin 483218e491 Fix for the Databinding issue where the kapt task started to early, not 
letting the Databinding pre-process the project.
 2017-06-06 17:21:20 +03:00
Sergey Igushkin f053d79994 Add support for com.android.feature plugin. 2017-06-06 17:21:20 +03:00
Alexander Udalov 751ff48301 Extract logic of builtins package fragment provider creation 
This allows to drop the compile dependency of module 'descriptors' on
'deserialization', breaking the circular dependency between them
 2017-06-06 14:29:20 +03:00
Alexander Udalov a4931568ba Relocate service definition files for kotlin-reflect 
See
http://imperceptiblethoughts.com/shadow/#merging_service_descriptor_files

 #KT-16810 Fixed
 2017-06-06 14:29:17 +03:00
Alexey Tsvetkov 5a22917f82 Run Gradle Android tests with other Gradle tests 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov aa9a40b61b Add tests with new Android Gradle Plugin 2017-05-31 16:59:03 +03:00
Sergey Igushkin dce6a4f869 Fix UnsupportedOperationException caused by mutation of FileCollection 2017-05-31 16:59:03 +03:00
Sergey Igushkin a68f7d79f5 Migration to AGP 2.3.0 2017-05-31 16:59:03 +03:00
Sergey Igushkin 6e721c4cee Further fixes for Android tests on TeamCity 
Added support repository to download_android_sdk.xml
Changed the build tools version in testProject to 23.0.1

(trial) Remove platform 22
 2017-05-31 16:59:03 +03:00
Sergey Igushkin 227a1d5fa0 Got rid of the sdk-manager plugin. 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov 18505157e0 Fix failing Gradle tests 
* Extract ANDROID_HOME_PATH constant
* Set ANDROID_HOME_PATH to dependencies/androidSDK
* Running download_android_sdk.xml is now needed to run Gradle Integration Tests
* Modify download_android_sdk.xml so that tools/android is executable

(cherry picked from commit 75a6e37)
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov 6e07b1cd99 Gradle: set default values of languageVersion and apiVersion to null 
Before the change, Gradle always explicitly set language and api
version to the latest version, preventing the compiler
from inferencing the arguments.

     #KT-18047 fixed
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov 5fbb41bf86 Stabilize test of Gradle's daemon for memory leaks 
We need to wait for GC to finish, because GC can be concurrent
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov d80a463735 Report memory usage only when system property is set 
This improves performance of Gradle builds with debug logging (--debug),
because System.gc is now forced only when the system property
'kotlin.gradle.test.report.memory.usage' is set.

    #KT-17960 fixed
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov a6a829c272 Improve test error message 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov e1457ffea0 Limit max number of active Gradle processes for the test run 
This is needed to avoid retaining memory by each Gradle version
which is critical for running tests on CI server.
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov 2fa8a1139f Refactor Gradle ITs so any Gradle wrapper version can be used 
This change:
* fixes tests with missing (in branch 1.1.3) GradleWrapper-3.4
* enables using any Gradle version in integration tests
without adding a new GradleWrapper-<version> dir.

The only difference between wrappers is in a version
number in a `gradle-wrapper.properties` file.
I removed all but one wrappers from `test/resources`,
and replaced the version with the template token <GRADLE_WRAPPER_VERSION>
for the remaining wrapper.
During a test run a template wrapper for each required version
is copied to a temporary directory.
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov be1b1029a4 Minor: add .gitignore for gradle-tools 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov a8263361c0 Fix tests for coroutines setting in Gradle 
ArgumentUtils#convertArgumentsToStringList does not
serialize an argument with default value,
so the string "-Xcoroutines=warn" was no longer present in logs.
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov 0a17dc3229 Refactor kapt tasks' wiring 
* Unify tasks wiring for new and old Android Gradle Plugin
* rename wireKaptTask->registerGeneratedJavaSource
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov e529592d15 Pass task object instead of task name to dependsOn 
This simplifies filtering out dependsOn later
 2017-05-31 16:59:03 +03:00
Alexey Tsvetkov c8d05f8485 Remove most of Gradle tests with Jack 
Jack is deprecated and Kotlin Gradle plugin throws,
so one test checking that build is failing with the exception
is enough.
 2017-05-31 16:59:02 +03:00
Alexey Tsvetkov 0cb67b4052 Minor: simplify expression 2017-05-31 16:59:02 +03:00
Alexey Tsvetkov c20d569aaa Simplify friend paths configuration 2017-05-31 16:59:02 +03:00
Sergey Igushkin 3e95a551e0 Various fixes 
* Expose internals as public to use them in the agp25 source set
* Refactor of Android25ProjectHandler.kt
* Fix Kapt3 for non-Android projects
 2017-05-31 16:59:02 +03:00