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

Fix Jewel 0.12 Api usage, rollback to compose Splitpane, add InfoPanelConent #14

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
1b73947
Update build.gradle.kts base version to "233.11200-SNAPSHOT" from the…
lamba92 Dec 1, 2023
1d085e7
Adapted publication logic for 233
lamba92 Dec 4, 2023
a4fd0e5
Adding scrollbars to tree and packages list, added minimum details pa…
fscarponi Dec 4, 2023
8904c6d
Updated publication logic for snapshots
lamba92 Dec 4, 2023
4cf0342
Details panel has spurious padding at the top and bottom
fscarponi Dec 4, 2023
89f793f
Improve search result retrieval and clean unused import
lamba92 Dec 5, 2023
a7961ae
Migrate Dropdown API to DropdownLink, fixes various cosmetics issues …
fscarponi Dec 5, 2023
7e7c9b3
Fixed logic for compatible package types for Maven, Gradle and KMP.
lamba92 Dec 6, 2023
2524008
Fix TBE issues with semver tags
lamba92 Dec 7, 2023
26ced40
Update publish-snapshot.yml to restrict pushes to master releases/233
lamba92 Dec 7, 2023
8a9fd3d
Refactor snapshot versioning and deployment process
lamba92 Dec 8, 2023
5341459
Refactor snapshot versioning and deployment process v2
lamba92 Dec 8, 2023
6cf90de
Use map lookup operations instead of `getValue` in PackageListViewModel
lamba92 Dec 8, 2023
70044ab
Remove kotlinx-datetime dependency from build files
lamba92 Dec 8, 2023
2eee3e9
fix PKGS-1324 Ignore duplicate package declarations
lamba92 Dec 8, 2023
8fe48c0
fix PKGS-1325 Filter installed packages based on search
lamba92 Dec 8, 2023
2fbc750
Remove PackageSearch ApiClient coroutine scope.
lamba92 Dec 8, 2023
3744b6c
Refactor API call handling and error flow control
lamba92 Dec 8, 2023
ac298ae
Fix PKGS-1285 Some Maven dependencies get "unknown" type
lamba92 Dec 8, 2023
3378d8d
Reduce initial divider position in PackageSearchPackagePanel
lamba92 Dec 8, 2023
b9354ba
Refactor PackageListBuilder removing count
lamba92 Dec 8, 2023
c232fbf
Made header title clickable as well, made updates count in header be …
lamba92 Dec 8, 2023
d3d1246
Fix PKGS-1319 - Search glitch on module selection change (#7)
fscarponi Dec 8, 2023
75b1de6
Add logging facilities for analytics
lamba92 Dec 11, 2023
ff797d4
Disabling KMP Gradle support when Amper Gradle plugin is enabled.
lamba92 Dec 11, 2023
857ddcb
Remove unused init block in ToolWindowViewModel.kt
lamba92 Dec 11, 2023
4c6b866
Refactor validation and preference fields to use different method and…
lamba92 Dec 11, 2023
83e0144
Improve encapsulation and access control in PackageSearchEventsLogger
lamba92 Dec 11, 2023
33c408b
Improve logPackageScopeChanged function and add scope validation
lamba92 Dec 12, 2023
29183a4
Changed FUS field validators to use "StringValidatedByRegexp" instead…
lamba92 Dec 12, 2023
3de0e97
Update IntelliJ plugin version
lamba92 Dec 12, 2023
8967d48
Update ideaGradlePlugin version
lamba92 Dec 14, 2023
ab43c07
Generate correct plugin version sources in `core` module.
lamba92 Dec 14, 2023
0b9b65d
Refactor UI theme and refresh status handling in Package Search plugin
lamba92 Dec 20, 2023
1f8e882
Bump api-models commit hash
lamba92 Dec 21, 2023
faf3693
Change PackageSearchApiClient to use default endpoints
lamba92 Jan 9, 2024
9d27c69
Add Apache License, update README, create CODE_OF_CONDUCT.md
lamba92 Jan 9, 2024
07dccb3
Removed Jewel from dependencies and Compose/Jewel shadowing from fatj…
fscarponi Jan 10, 2024
b77aedc
Rollback to Compose Foundation SplitPane (#10)
fscarponi Jan 10, 2024
5ce446d
Introduce InfoPanelContent attributes and update UI in HeaderAttribut…
fscarponi Jan 10, 2024
fd57262
Fix Jewel and Compose dependencies, align code to jewel 0.12
fscarponi Jan 10, 2024
a44f9bc
Optimize Gradle version check in PackageSearchGradleModelBuilder
lamba92 Jan 11, 2024
767aa10
Include retry mechanism in multiple coroutines flow
lamba92 Jan 11, 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
4 changes: 3 additions & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish snapshot to TBE

on:
push:
branches: [ master ]
branches: [ releases/233 ]

jobs:
publish:
Expand All @@ -26,3 +26,5 @@ jobs:
GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
MAVEN_SPACE_PASSWORD: ${{ secrets.MAVEN_SPACE_PASSWORD }}
MAVEN_SPACE_USERNAME: ${{ secrets.MAVEN_SPACE_USERNAME }}
RUN_NUMBER: ${{ github.run_number }}
RUN_ATTEMPT: ${{ github.run_attempt }}
5 changes: 5 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Code of Conduct

This project and the corresponding community is governed by
the [JetBrains Open Source and Community Code of Conduct](https://confluence.jetbrains.com/display/ALL/JetBrains+Open+Source+and+Community+Code+of+Conduct).
Please make sure you read it.
202 changes: 202 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2000-2021 JetBrains s.r.o.

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.
34 changes: 34 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Package Search [![official JetBrains project](https://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)

Package Search is an IntelliJ plugin that allows you to search for packages from the editor. It supports searching for
packages from the following package managers by default:

- [Maven](https://maven.apache.org/)
- [Gradle](https://gradle.org/)
- [Amper](https://blog.jetbrains.com/blog/2023/11/09/amper-improving-the-build-tooling-user-experience/)

It also supports Kotlin Multiplatform projects for both for Gradle and Amper.

![Package Search](https://plugins.jetbrains.com/files/12507/screenshot_2db7914e-4a6a-45a1-aa34-ed00b150cf62)
![Package Search](https://plugins.jetbrains.com/files/12507/screenshot_26124d52-4baf-4e5c-bff3-1ecb81efd83c)

# Installation

You can download the plugin from the [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/12507-package-search)
or directly in IntelliJ by going to `Preferences > Plugins > Marketplace` and searching for `Package Search`.

The plugin is compatible with IntelliJ 2023.2 and newer.

# Building

To build the plugin, run the following command:

```shell
./gradlew :plugin:buildShadowPlugin
```

To run the plugin, run the following command:

```shell
./gradlew :plugin:runIde
```
5 changes: 1 addition & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
@file:Suppress("UnstableApiUsage")

import java.lang.System.getenv
import kotlinx.datetime.Clock
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
import org.jetbrains.packagesearch.gradle.pkgsSpace

plugins {
Expand All @@ -14,7 +11,7 @@ plugins {

allprojects {
group = "org.jetbrains.packagesearch"
val baseVersion = "2.0.0-SNAPSHOT"
val baseVersion = "233.13000-SNAPSHOT"
version = when (val ref = getenv("GITHUB_REF")) {
null -> baseVersion
else -> when {
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ dependencies {
implementation(packageSearchCatalog.kotlinx.serialization.json)
implementation("com.squareup:kotlinpoet:1.14.2")
implementation("io.github.pdvrieze.xmlutil:serialization:0.86.2")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fun Project.configureGradleIntellijPlugin(packageSearchExtension: PackageSearchE

plugins.withId("org.jetbrains.intellij") {
extensions.withType<IntelliJPluginExtension> {
version = "233-EAP-SNAPSHOT"
version = "2023.3"
instrumentCode = false
downloadSources = !isCI
}
Expand All @@ -24,9 +24,6 @@ fun Project.configureGradleIntellijPlugin(packageSearchExtension: PackageSearchE
relocate("io.ktor", "shadow.io.ktor")
relocate("kotlinx.serialization", "shadow.kotlinx.serialization")
relocate("kotlinx.datetime", "shadow.kotlinx.datetime")
relocate("androidx", "shadow.androidx")
relocate("org.jetbrains.jewel", "shadow.org.jetbrains.jewel")
relocate("org.jetbrains.compose", "shadow.org.jetbrains.compose")
exclude {
it.name.containsAny(packageSearchExtension.librariesToDelete.get())
&& !it.name.containsAny(packageSearchExtension.librariesToKeep.get())
Expand All @@ -43,4 +40,4 @@ fun Project.configureGradleIntellijPlugin(packageSearchExtension: PackageSearchE
}
}
}
}
}
2 changes: 1 addition & 1 deletion package-search-api-models
Submodule package-search-api-models updated 15 files
+31 −0 build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/FallbackMavenPomProvider.kt
+18 −11 build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/HttpClientMavenPomProvider.kt
+17 −17 build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/PomResolver.kt
+83 −16 build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/Utils.kt
+55 −27 http/client/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/http/PackageSearchApiClient.kt
+27 −2 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/http/Http.kt
+15 −9 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/http/PackageSearchDefaultEndpoints.kt
+11 −2 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/http/PackageSearchEndpoints.kt
+23 −33 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/GradlePackagesBuilder.kt
+29 −16 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/KotlinMultiplatformBuilder.kt
+24 −0 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/NextScrollParametersBuilder.kt
+43 −1 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/PackagesTypeBuilder.kt
+3 −4 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/SearchParametersBuilder.kt
+30 −0 http/src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/search/StartScrollParametersBuilder.kt
+12 −0 src/commonMain/kotlin/org/jetbrains/packagesearch/api/v3/ApiScm.kt
4 changes: 3 additions & 1 deletion packagesearch.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dokka = "1.9.10"
foojay = "0.5.0"
gradlePublishPlugin = "1.1.0"
idea = "2023.1.2"
ideaGradlePlugin = "1.14.1"
ideaGradlePlugin = "1.16.1"
junit = "5.10.0"
junit4 = "4.13.2"
kotlin = "1.9.20"
Expand Down Expand Up @@ -37,8 +37,10 @@ ij-platform-ide-core = { module = "com.jetbrains.intellij.platform:ide-core", ve
ij-platform-ide-impl = { module = "com.jetbrains.intellij.platform:ide-impl", version.ref = "idea" }
jewel-ui = { module = "org.jetbrains.jewel:jewel-ui", version.ref = "jewel" }
jewel-foundation = { module = "org.jetbrains.jewel:jewel-foundation", version.ref = "jewel" }
jewel-standalone = { module= "org.jetbrains.jewel:jewel-int-ui-standalone", version.ref = "jewel" }
jewel-bridge-ij232 = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge", version.ref = "jewel-bridge-232" }
jewel-bridge-ij233 = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge", version.ref = "jewel-bridge-233" }
compose-desktop-components-splitpane = { module = "org.jetbrains.compose.components:components-splitpane", version.ref = "composeDesktop" }
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
Expand Down
Loading