Skip to content

Commit

Permalink
Cleanup jline dependencies (#12020)
Browse files Browse the repository at this point in the history
A wild attempt at fixing MacOS signing process that prevents nightlies from working.
Also cleaned up dependencies for wrapper projects - `scala-compiler` was unnecessary and was introducing jline requirement.
Related to #11957.

# Important Notes
Not sure if this will fix the nightly as I'm still unable to confirm the real issue but this doesn't hurt.
  • Loading branch information
hubertp authored Jan 9, 2025
1 parent bfd31f9 commit c6f4b4a
Show file tree
Hide file tree
Showing 78 changed files with 342 additions and 1,171 deletions.
2 changes: 1 addition & 1 deletion app/ide-desktop/client/tasks/signArchivesMacOs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ async function ensoPackageSignables(resourcesDir: string): Promise<Signable[]> {
],
['component/jna-*.jar', ['com/sun/jna/*/libjnidispatch.jnilib']],
[
'component/jline-*.jar',
'component/jline-native-*.jar',
[
'org/jline/nativ/Mac/arm64/libjlinenative.jnilib',
'org/jline/nativ/Mac/x86_64/libjlinenative.jnilib',
Expand Down
82 changes: 37 additions & 45 deletions build.sbt

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions distribution/engine/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Enso
Copyright 2020 - 2024 New Byte Order sp. z o. o.
Copyright 2020 - 2025 New Byte Order sp. z o. o.

'shapeless_2.13', licensed under the Apache 2, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Expand Down Expand Up @@ -191,11 +191,6 @@ The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `io.circe.circe-parser_2.13-0.14.7`.


'java-diff-utils', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `io.github.java-diff-utils.java-diff-utils-4.12`.


'helidon-builder-api', licensed under the Apache 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.1.2`.
Expand Down Expand Up @@ -506,9 +501,24 @@ The license file can be found at `licenses/Universal_Permissive_License__Version
Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-runtime-24.0.0`.


'jline', licensed under the The BSD License, is distributed with the engine.
'jline-native', licensed under the The BSD License, is distributed with the engine.
The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-native-3.26.3`.


'jline-reader', licensed under the The BSD License, is distributed with the engine.
The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-3.26.3`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-reader-3.26.3`.


'jline-terminal', licensed under the The BSD License, is distributed with the engine.
The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-terminal-3.26.3`.


'jline-terminal-jna', licensed under the The BSD License, is distributed with the engine.
The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-terminal-jna-3.26.3`.


'org-netbeans-modules-sampler', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
Expand Down Expand Up @@ -541,11 +551,6 @@ The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2`.


'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.15`.


'scala-library', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.15`.
Expand Down

This file was deleted.

49 changes: 0 additions & 49 deletions distribution/engine/THIRD-PARTY/org.jline.jline-3.26.3/NOTICES

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2009-2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/

Copyright (c) 2023, the original author or authors.

Copyright 2019 the original author or authors.
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/*
* Copyright (c) 2002-2016, the original author or authors.
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2016, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2017, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2018, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2019, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2020, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2021, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

<!--

Copyright (c) 2002-2020, the original author or authors.

This software is distributable under the BSD license. See the terms of the
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (c) 2009-2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2022, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2023, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

Copyright (C) 2022 the original author(s).

Copyright (c) 2002-2016, the original author or authors.

Copyright (c) 2002-2016, the original author(s).

Copyright (c) 2002-2017, the original author(s).

Copyright (c) 2002-2018, the original author or authors.

Copyright (c) 2002-2018, the original author(s).

Copyright (c) 2002-2019, the original author(s).

Copyright (c) 2002-2020, the original author or authors.

Copyright (c) 2002-2020, the original author(s).

Copyright (c) 2002-2021, the original author(s).

Copyright (c) 2002-2023, the original author(s).

Copyright (c) 2009-2018, the original author(s).
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright (c) 2002-2016, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2017, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2018, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

/*
* Copyright (c) 2002-2020, the original author(s).
*
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*
* https://opensource.org/licenses/BSD-3-Clause
*/

Copyright (C) 2022 the original author(s).

Copyright (c) 2002-2020, the original author or authors.
Loading

0 comments on commit c6f4b4a

Please sign in to comment.