Decoupling plugin from buildScript #47
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
MarcoSignoretto
commented
Aug 10, 2021
MarcoSignoretto
commented
- Moved the plugin on its standalone module to be able to publish
- Refactor and clean up
- Gradle wrapper upgrade
minaEweida
approved these changes
Aug 10, 2021
MarcoSignoretto
commented
Aug 19, 2021
* Moved the plugin on its standalone module to be able to publish * Refactor and clean up * Gradle wrapper upgrade
MarcoSignoretto
force-pushed
the
decouple_plugin
branch
from
aef7c8f to
9c4cff5
Compare
yunze-li
reviewed
Aug 22, 2021
MarcoSignoretto
commented
Aug 22, 2021
Comment on lines
+1
to
+36
| import org.gradle.initialization.DependenciesAccessors | ||
| import org.gradle.kotlin.dsl.support.serviceOf | ||
|
|
||
| /** | ||
| * | ||
| * Copyright Careem, an Uber Technologies Inc. company | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| enableFeaturePreview("VERSION_CATALOGS") | ||
|
|
||
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../versions.toml")) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| includeBuild("..") { | ||
| dependencySubstitution { | ||
| substitute(module("com.careem.mockingbird:mockingbird")).using(project(":mockingbird")) | ||
| substitute(module("com.careem.mockingbird:mockingbird-compiler")).using(project(":mockingbird-compiler")) | ||
| } | ||
| } |
There was a problem hiding this comment.
this makes samples a standalone project, allowing to use local plugin definition ( inspired by Sqldelight )
MarcoSignoretto
commented
Aug 23, 2021
MarcoSignoretto
commented
Aug 23, 2021
| } | ||
| } | ||
|
|
||
| void setupMultiplatformLibrary(Project project, Boolean shouldPublish = true) { |
There was a problem hiding this comment.
extracted this in utils.gradle
MarcoSignoretto
commented
Aug 23, 2021
| @@ -20,6 +20,8 @@ plugins { | |||
| `kotlin-dsl` | |||
| } | |||
|
|
|||
| apply(from = "../publishing.gradle") | |||
There was a problem hiding this comment.
allow to publish the gradle plugin
MarcoSignoretto
commented
Aug 23, 2021
| setupMultiplatformLibrary(project, false) | ||
| setupAllTargetsWithDefaultSourceSets(project, false) // FIXME Js excluded here | ||
|
|
||
| apply plugin: "com.careem.mockingbird" |
There was a problem hiding this comment.
apply plugin as any external plugin
MarcoSignoretto
commented
Aug 23, 2021
|
|
||
| kotlin { | ||
| sourceSets { | ||
| commonMain { | ||
| dependencies { | ||
| implementation project(":mockingbird") | ||
| implementation "com.careem.mockingbird:mockingbird" |
There was a problem hiding this comment.
this will use the local module because set in dependency resolution strategy
MarcoSignoretto
commented
Aug 23, 2021
| void setupAllTargetsWithDefaultSourceSets(Project project, Boolean includeJs = true) { | ||
| setupIosTargets(project) | ||
| setupJvmTarget(project) | ||
| if(includeJs){ |
There was a problem hiding this comment.
I had to add this since JsPlugin is in buildSrc but buildSrc is not available in sample
nikolaykasyanov
approved these changes
Aug 24, 2021
| @@ -0,0 +1,26 @@ | |||
| <component name="ProjectCodeStyleConfiguration"> | |||
There was a problem hiding this comment.
In the long term, let's migrate to .editorconfig.
There was a problem hiding this comment.
Also, doies this file provide any advantages over setting code style to official in gradle.properties?
There was a problem hiding this comment.
it has also the import settings that can be moved into .editorconfig as well
There was a problem hiding this comment.
Let's keep the migration to .editorconfig out of scope for this PR
Comment on lines
+1
to
+36
| import org.gradle.initialization.DependenciesAccessors | ||
| import org.gradle.kotlin.dsl.support.serviceOf | ||
|
|
||
| /** | ||
| * | ||
| * Copyright Careem, an Uber Technologies Inc. company | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| enableFeaturePreview("VERSION_CATALOGS") | ||
|
|
||
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../versions.toml")) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| includeBuild("..") { | ||
| dependencySubstitution { | ||
| substitute(module("com.careem.mockingbird:mockingbird")).using(project(":mockingbird")) | ||
| substitute(module("com.careem.mockingbird:mockingbird-compiler")).using(project(":mockingbird-compiler")) | ||
| } | ||
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.