Skip to content

Merge eap branch back into main #171

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 35 commits into from
Feb 28, 2023
Merged

Merge eap branch back into main #171

merged 35 commits into from
Feb 28, 2023
+67 −11

Conversation

fioan89
Copy link
Collaborator

@fioan89 fioan89 commented Feb 28, 2023

  • main branch will now support Gateway 2022.3 versions

fioan89 and others added 30 commits November 25, 2022 00:25
@fioan89
Impl: build against latest 2022.3 build
352a7b9
@fioan89
Next version: 3.0.0-eap
183bd97 
- major version changed because of Gateway API is incompatible with older versions
- eap is now the release channel.
@fioan89
Fix: build with Gateway 2022.3 RC API
b15d5f9
@fioan89
Change version to 2.1.2-eap.0
764e112 
- I think it's better for MAJOR.MINOR.PATCH to be synchronized with main branch.
- the first three versions will change when business will change while `eap-x` will be increased when support for new Gateway releases is added
@fioan89
Publish eap version on default release channel
748303b 
- release channels other than default one have to be
  configured by users the Jetbrains products which is
  a bit inconvenient.
 - as long as the Gateway supported versions don't
   overlap with main branch then it's safe to release
   in the main channel.
@fioan89
Execute github actions on eap branch
c180881
@fioan89
Merge branch 'main' into eap
59a7868
@fioan89
Changelog update should happen on eap branch
9bbaadd
@fioan89
publish release draft from eap branch
61eccfa
@fioan89
log more details when building and publishing plugin
3f20fc1
@actions-user
Changelog update - v2.1.2-eap.0
762fcee
@fioan89
Merge pull request #98 from coder/changelog-update-v2.1.2-eap.0
c7efb60 
Changelog update - `v2.1.2-eap.0`
@fioan89
Merge branch 'main' into eap
3d198f6 
- include all bugfixes and enhancements
  released with `2.1.3`
@actions-user
Changelog update - v2.1.3-eap.0
79db16e
@fioan89
Merge pull request #124 from coder/changelog-update-v2.1.3-eap.0
a80354e 
Changelog update - `v2.1.3-eap.0`
@fioan89
Merge branch 'main' into eap
d7c3a9d
@fioan89
Merge branch 'main' into eap
2e134ac
@fioan89
Merge branch 'main' into eap
52fa781
@fioan89
chore: update Gateway build
3d1a336
@actions-user
Changelog update - v2.1.4-eap.0
59b7f39
@fioan89
Merge pull request #138 from coder/changelog-update-v2.1.4-eap.0
0a4f879 
Changelog update - `v2.1.4-eap.0`
@fioan89
Merge branch 'main' into eap
72e71ed
@bpmct
release 2.15
bb02d97
@actions-user
Changelog update - v2.1.5-eap.0
d230767
@fioan89
Merge pull request #150 from coder/changelog-update-v2.1.5-eap.0
766b401 
Changelog update - `v2.1.5-eap.0`
@bpmct
fix URLs
79eacf1
@fioan89
Merge branch 'main' into eap
399888e
@fioan89
chore: develop using latest Gateway 2022.3.2
a196cc2
@fioan89
Merge branch 'main' into eap
860fccf
@fioan89
Merge branch 'main' into eap
f6584cf
kylecarbs
kylecarbs approved these changes Feb 28, 2023
View reviewed changes
Copy link
Member

@kylecarbs kylecarbs left a comment

Choose a reason for hiding this comment

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

Out of curiosity, what made the build break if no source-code changes needed to be made?

@fioan89 fioan89 merged commit 0444aea into main Feb 28, 2023
@fioan89
Copy link
Collaborator Author

fioan89 commented Feb 28, 2023

@kylecarbs there were a couple of explicit API calls that were not compatible with Gateway 2022.2, but I got rid of them two months ago with this rework: 0b5a256#diff-2181dc554d6743aadbfd2d3a9399b635536069a24e647fc82c98cdfa4fbf2bfa

There are however a couple of other things that make the SDK of Gateway 2022.2 and Gateway 2022.3 incompatible:

  • JDK 17. Gateway 2022.3 targets JDK 17 while 2022.2 is still on JDK 11.
  • linkage errors at runtime. One example, we implement a GatewayConnector interface, which in 2022.3 got a new method with a default implementation. Even though we don't explicitly use this new method in the plugin - Gateway does. If we don't compile against the new SDK to inherit this method then the plugin will fail to work with 2022.3. But if we do compile against the latest SDK, then we will have trouble running on 2022.2 because that can't run code targeting Java 17.

@code-asher code-asher deleted the eap-merge branch May 22, 2024 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylecarbs kylecarbs kylecarbs approved these changes

@bpmct bpmct Awaiting requested review from bpmct

@code-asher code-asher Awaiting requested review from code-asher

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fioan89 @kylecarbs @actions-user @bpmct