Skip to content

Commit bd02798

Browse files
GabrielaReynaGabrielaReyna
authored
Merge branch 'main' into showcase_components
2 parents 2df09da + 5f3e45a commit bd02798

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+927
-856
lines changed

‎content/blog/cheerpj-3-deep-dive.mdx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ CheerpJ 3.0 (old version) introduces a completely new JIT-based architecture whi
4646
value="NEW UPDATE"
4747
disabled
4848
/>
49-
**CheerpJ 4.1 Released!** Check out the [latest version of CheerpJ](https://labs.leaningtech.com/blog/cheerpj-4.1)!</div>
49+
50+
**CheerpJ 4.1 Released!** Check out the [latest version of
51+
CheerpJ](https://labs.leaningtech.com/blog/cheerpj-4.1)!
52+
</div>
53+
5054

5155
## What can CheerpJ do?
5256

‎content/blog/cheerpj-3.0.mdx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ We believe that this release brings a new era for deploying large scale Java app
4848
value="NEW UPDATE"
4949
disabled
5050
/>
51-
**CheerpJ 4.1 Released!** Check out the [latest version of CheerpJ](https://labs.leaningtech.com/blog/cheerpj-4.1)!</div>
51+
52+
**CheerpJ 4.1 Released!** Check out the [latest version of
53+
CheerpJ](https://labs.leaningtech.com/blog/cheerpj-4.1)!
54+
</div>
55+
5256

5357
## What is CheerpJ?
5458

‎packages/astro-theme/components/ProductVersionSwitcher.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const { product } = Astro.props;
1414
class="px-2 py-1 rounded bg-transparent text-stone-400 font-medium"
1515
id="version-switcher"
1616
>
17-
<option value="cheerpj3" selected={product.id === "cheerpj3"}>v4.1</option>
17+
<option value="cheerpj3" selected={product.id === "cheerpj3"}>v4.2</option>
1818
<option value="cheerpj2" selected={product.id === "cheerpj2"}>v2.3</option>
1919
</select>
2020
</div>

‎packages/astro-theme/lib/code-replace.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
let CX_LATEST = "1.1.2";
1+
let CX_LATEST = "1.1.5";
22

33
const replacements = [
44
[

‎packages/astro-theme/lib/products.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const products: { [product in Product]: ProductData } = {
6363
favicon: baseWithSlash + "cheerpj3/favicon.ico",
6464
subtitle: "Java Virtual Machine for modern web browsers",
6565
description:
66-
"Run Java 8 applications, libraries, applets, Java Web Start, and Oracle Forms on the web without legacy plugins.",
66+
"Run Java 8, 11 and 17 applications, libraries, applets, Java Web Start, and Oracle Forms on the web without legacy plugins.",
6767
github: "https://github.com/leaningtech/cheerpj-meta",
6868
repositoryName: "cheerpj-meta",
6969
},

‎sites/cheerpj/public/cheerpj3/assets/filechooser.png‎

214 KB
Loading

‎sites/cheerpj/src/content/docs/00-overview.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import AppletRunnerButton from "@leaningtech/astro-theme/components/AppletRunner
3131

3232
<div class="text-lg">
3333
CheerpJ is a WebAssembly-based **Java Virtual Machine for the browser**. It
34-
has extensive compatibility with Java 8 and Java 11. CheerpJ provides a full
34+
has extensive compatibility with Java 8, 11 and 17. CheerpJ provides a full
3535
runtime environment[^compat] for running Java applications, applets (Java 8),
3636
libraries, and Java Web Start / JNLP applications in the browser without
3737
plugins.
@@ -44,7 +44,7 @@ import AppletRunnerButton from "@leaningtech/astro-theme/components/AppletRunner
4444
</div>
4545

4646
```html
47-
<script src="https://cjrtnc.leaningtech.com/4.1/loader.js"></script>
47+
<script src="https://cjrtnc.leaningtech.com/4.2/loader.js"></script>
4848
```
4949

5050
<div class="mx-24">![](./explanation-diagram.png)</div>
@@ -125,7 +125,7 @@ Both are written in C++ and are compiled to WebAssembly & JavaScript using [Chee
125125

126126
## What's unique about CheerpJ?
127127

128-
1. Extensive support for Java 8 and Java 11, including Swing, reflection and dynamic class loading with no manual intervention on the code.
128+
1. Extensive support for Java 8, 11 and 17, including Swing, reflection and dynamic class loading with no manual intervention on the code.
129129
2. CheerpJ works directly on Java bytecode, and does not require access to the Java source code.
130130
3. CheerpJ comes with a full Java SE runtime, inclusive of Swing/AWT. It supports audio, printing, and any other Java SE features. The runtime supports WebAssembly for optimal performance and size.
131131
4. The JavaScript code generated by the CheerpJ JIT is highly optimised and garbage-collectible.

‎sites/cheerpj/src/content/docs/10-getting-started/00-Java-app.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Let's create a basic HTML file like the following example. Please notice the Che
3333
<head>
3434
<meta charset="utf-8" />
3535
<title>CheerpJ test</title>
36-
<script src="https://cjrtnc.leaningtech.com/4.1/loader.js"></script>
36+
<script src="https://cjrtnc.leaningtech.com/4.2/loader.js"></script>
3737
</head>
3838
<body>
3939
<script>

‎sites/cheerpj/src/content/docs/10-getting-started/01-Java-applet.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ In order to integrate CheerpJ, you just need to add:
3838
1. A simple `<script>` within the `<head>` of your page with the CheerpJ runtime loader.
3939

4040
```html
41-
<script src="https://cjrtnc.leaningtech.com/4.1/loader.js"></script>
41+
<script src="https://cjrtnc.leaningtech.com/4.2/loader.js"></script>
4242
```
4343

4444
2. A second script calling [`cheerpjInit()`] to initialize CheerpJ's runtime environment.
@@ -57,7 +57,7 @@ For example:
5757
<head>
5858
<meta charset="utf-8" />
5959
<title>CheerpJ applet test</title>
60-
<script src="https://cjrtnc.leaningtech.com/4.1/loader.js"></script>
60+
<script src="https://cjrtnc.leaningtech.com/4.2/loader.js"></script>
6161
</head>
6262
<body>
6363
<applet
@@ -74,7 +74,7 @@ For example:
7474
```
7575

7676
> [!info] Java Applets and Java 8
77-
> The method ´cheerpJInit´ runs Java 8 by default if the Java version is not specified. Please notice that if you change the version to Java 11 applets won't work.
77+
> The method ´cheerpJInit´ runs Java 8 by default if the Java version is not specified. Please notice that if you change the version to Java 11 or higher, applets won't work.
7878
7979
### 2. Host your page locally
8080

‎sites/cheerpj/src/content/docs/10-getting-started/02-Java-library.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Use Java classes in JavaScript
66
## 1. Include CheerpJ on your page
77

88
```html
9-
<script src="https://cjrtnc.leaningtech.com/4.1/loader.js"></script>
9+
<script src="https://cjrtnc.leaningtech.com/4.2/loader.js"></script>
1010
```
1111

1212
## 2. Initialize CheerpJ and load your Java library

0 commit comments

Comments
 (0)