Skip to content
This repository was archived by the owner on Aug 19, 2020. It is now read-only.

Merge v0.13.1 into master and upgrade wrappers to Gradle 4.4 #628

Merged
merged 129 commits into from
Dec 13, 2017
Merged

Merge v0.13.1 into master and upgrade wrappers to Gradle 4.4 #628

merged 129 commits into from
Dec 13, 2017

Conversation

@bamboo
Copy link
Member

@bamboo bamboo commented Dec 12, 2017

No description provided.

bamboo and others added 30 commits October 10, 2017 17:27
@bamboo
Bump version number {0.12.1 => 0.13.0-SNAPSHOT}
dd41756
@bamboo
Polish PluginRequestsHandlerTest
5da85a0 
 - Rename variable for clarity
@bamboo
Polish SamplesSmokeTest
81c52f5 
 - Extract explaining method
@eskatos
Update wrappers to latest snapshot distro
1d6919e
@eskatos
Fix implicit imports tests after upstream default imports unification
16a303d 
See gradle/gradle#3140
@eskatos
Support for Kotlin settings scripts, aka. settings.gradle.kts
fe54e0a
@eskatos
Add some Settings extensions for ease of use
55fd604
@eskatos
Build script dependencies resolver takes kts settings into account
b0be135 
for resolving build roots.
@eskatos
Integration tests use settings.gradle.kts files
964f074
@eskatos
Refine CachingKotlinCompiler
7fea289
@eskatos
Refine KotlinBuildScriptCompiler
3cc2e9e
@eskatos
withSettingsScript(..) & withSettingsScriptIn(..) fixtures
e136405
@eskatos
KotlinScriptPluginTarget as a sealed hierarchy of data classes
1cc0c05
@eskatos
Refine projectRootsOf(..)
3035e37 
Simply check for settings.gradle.kts then settings.gradle.
This code runs in IntelliJ and cannot rely on Gradle services.

It could, and will, make use of a client side mechanism provided by the
TAPI, see gradle/gradle#1994
@eskatos
Keep 1 test exercising groovy-dsl settings with kotlin-dsl build script
398c85a
@eskatos
Remove premature Settings extensions
0dbba5f
@eskatos
KotlinScriptPluginTarget is responsible for configuring actual targets
580a6ac 
Removing the need for duplicated target type matching
in KotlinScriptPlugin
@eskatos
Address minor review comments
ad94735
@bamboo @eskatos
Dedupe KotlinScriptPluginTarget configuration
62a6a61
@bamboo @eskatos
Replace conditional invocation by function with nullable result type
4933763
@bamboo @eskatos
Polish KotlinScriptPluginTarget
705c542 
 - DRY Gradle property definitions
@bamboo @eskatos
Remove ClassLoader hierarchy logging
6e6154c 
It hasn't been necessary for a while now and we can always recover
this code if it becomes useful again.
@bamboo @eskatos
Replace class hierarchy by data class values
a287729 
Also:

 - Rename `targetType` to `type` as _target_ is already in the type
   name
@bamboo @eskatos
Rename { KotlinScriptPluginTarget => KotlinScriptTarget }
a1d3335
@bamboo @eskatos
Remove unused property
3e15253
@bamboo @eskatos
Simplify expression
5ff6cbb
@eskatos
Merge pull request #541 from gradle/eskatos/provider/settings-target
659fe18 
Support `Settings` as a script target
@eskatos
JavaScript sample apply kotlin2js plugin using the plugins {} block
4b1e0f0
@eskatos
Account for PropertyState deprecation in favor of Property
79fb412 
And project.property() in favor of project.objects.property()

Take the opportunity and rename to messageProperty
@eskatos
Update wrappers to latest snapshot distro
088c08c
bamboo and others added 23 commits November 13, 2017 14:12
@bamboo
⬆️ Kotlin 1.1.60 🎉
6d12902 
See #551
@bamboo
Let Kotlin work out the current JRE classes by itself
12b57b6 
See #551
@bamboo
Let the Kotlin compiler work out the JDK home on Java < 9
95983ff 
See #551
@bamboo
Temporarily disable tests requiring new kotlin-dsl version
9ca5ffd 
See #551
@bamboo
Remove special Java 9 treatment
5cacaee
@bamboo
Update wrappers to latest snapshot distro
843c51e
@bamboo
Publish 0.13.0 version of the plugins
2bba3fa
@bamboo
Bump plugins version
2dbea0c
@bamboo
Re-enable sample tests
1e0061d
@bamboo
Update wrappers to latest snapshot distro
e9bc2b0
@bamboo
Prepare 0.13.0 release
51ae0f8
@bamboo
Toward 0.14.0
356e88d
@bamboo
Revert ":arrow_up: Kotlin 1.1.60 :tada:"
ea46b72 
This reverts commit 6d12902.
@bamboo
Revert "Bump plugins version"
6dbd98a 
This reverts commit 2dbea0c.
@bamboo
Bump future plugins version
88fe166 
As to avoid any confusion on what the next version number should be.
@bamboo
Revert "Let Kotlin work out the current JRE classes by itself"
628599a 
This reverts commit 12b57b6.
@bamboo
Merge pull request #599 from gradle/bamboo/revert-kotlin-1.1.60
0bab87a 
Revert upgrade to Kotlin 1.1.60
@bamboo
Toward 0.13.1
b5727aa
@eskatos
Update wrappers to latest snapshot distro
27f9043
@eskatos
Bump plugins version
9a6eb78
@eskatos
Update wrappers to latest snapshot distro
75254bb
@bamboo
Prepare 0.13.1 release
95d1fcb
@bamboo
Merge v0.13.1 into master and upgrade wrappers to Gradle 4.4
2a91d86
@bamboo bamboo added the a:chore label Dec 12, 2017
@bamboo bamboo added this to the 0.15.0 milestone Dec 12, 2017
@bamboo bamboo self-assigned this Dec 12, 2017
@bamboo bamboo requested a review from eskatos December 12, 2017 19:36
eskatos
eskatos approved these changes Dec 13, 2017
View reviewed changes
Copy link
Member

@eskatos eskatos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

@bamboo bamboo merged commit 99d67fc into master Dec 13, 2017
@bamboo bamboo deleted the bamboo/master/v0.13.1 branch February 1, 2018 16:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@eskatos eskatos eskatos approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@bamboo bamboo

Labels

a:chore

Projects

None yet

Milestone

0.15.x

Development

Successfully merging this pull request may close these issues.

7 participants

@bamboo @eskatos @oehme @JLLeitschuh @TWiStErRob @mkobit @liutikas