Skip to content

Commit 3b0e2cb

Browse files
committed
compiles with jdk 21 up to egg__10b
1 parent 18eacc8 commit 3b0e2cb

File tree

12 files changed

+13
-17
lines changed

12 files changed

+13
-17
lines changed

build-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ cd $MY_HOME/egg_7_sc_deadline
2828
cd $MY_HOME/egg_8_sc_custom_invoke_some
2929
./clean.sh && ./compile.sh
3030

31-
exit 0
32-
3331
cd $MY_HOME/egg_9_sc_fan_in/client
3432
./clean.sh && ./compile.sh
3533

@@ -42,6 +40,8 @@ cd $MY_HOME/egg__10_sc_nested_scopes_thread_dump
4240
cd $MY_HOME/egg__10b_sc_nested_experiment
4341
./clean.sh && ./compile.sh
4442

43+
exit 0
44+
4545
cd $MY_HOME/egg__11_sc_utility
4646
./clean.sh && ./compile.sh
4747

egg_9_sc_fan_in/client/compile.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
1010

1111
mkdir -p $TARGET_DIR
1212

13-
javac --release 19 --enable-preview \
13+
javac --release 21 --enable-preview \
1414
-cp $CLASSPATH \
15-
--add-modules jdk.incubator.concurrent \
1615
-d $TARGET_DIR `find $SRC_DIR -name "*.java"`
1716

1817
echo "compile ok"

egg_9_sc_fan_in/client/src/main/java/net/codetojoy/Runner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.net.*;
77
import java.util.stream.IntStream;
88

9-
import jdk.incubator.concurrent.*;
9+
import java.util.concurrent.*;
1010

1111
public class Runner {
1212
private static final String LOG_PREFIX = "TRACER Runner ";

egg_9_sc_fan_in/server/compile.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
1010

1111
mkdir -p $TARGET_DIR
1212

13-
javac --release 19 --enable-preview \
13+
javac --release 21 --enable-preview \
1414
-cp $CLASSPATH \
15-
--add-modules jdk.incubator.concurrent \
1615
-d $TARGET_DIR `find $SRC_DIR -name "*.java"`
1716

1817
echo "compile ok"

egg_9_sc_fan_in/server/src/main/java/net/codetojoy/Runner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.concurrent.atomic.AtomicBoolean;
99
import java.util.stream.IntStream;
1010

11-
import jdk.incubator.concurrent.*;
11+
import java.util.concurrent.*;
1212

1313
// see fan-in here: https://openjdk.java.net/jeps/428
1414
// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html

egg__10_sc_nested_scopes_thread_dump/compile.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
1010

1111
mkdir -p $TARGET_DIR
1212

13-
javac --release 19 --enable-preview \
13+
javac --release 21 --enable-preview \
1414
-cp $CLASSPATH \
15-
--add-modules jdk.incubator.concurrent \
1615
-d $TARGET_DIR `find $SRC_DIR -name "*.java"`
1716

1817
echo "compile ok"

egg__10_sc_nested_scopes_thread_dump/src/main/java/net/codetojoy/BarWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// note: I no longer own this domain
33
package net.codetojoy;
44

5-
import jdk.incubator.concurrent.StructuredTaskScope;
5+
import java.util.concurrent.StructuredTaskScope;
66

77
class BarWorker {
88

egg__10_sc_nested_scopes_thread_dump/src/main/java/net/codetojoy/FooWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// note: I no longer own this domain
33
package net.codetojoy;
44

5-
import jdk.incubator.concurrent.StructuredTaskScope;
5+
import java.util.concurrent.StructuredTaskScope;
66

77
class FooWorker {
88
Void spawn(String name) {

egg__10_sc_nested_scopes_thread_dump/src/main/java/net/codetojoy/Runner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// note: I no longer own this domain
33
package net.codetojoy;
44

5-
import jdk.incubator.concurrent.StructuredTaskScope;
5+
import java.util.concurrent.StructuredTaskScope;
66

77
import java.time.Instant;
88
import java.io.*;

egg__10b_sc_nested_experiment/compile.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
1010

1111
mkdir -p $TARGET_DIR
1212

13-
javac --release 19 --enable-preview \
13+
javac --release 21 --enable-preview \
1414
-cp $CLASSPATH \
15-
--add-modules jdk.incubator.concurrent \
1615
-d $TARGET_DIR `find $SRC_DIR -name "*.java"`
1716

1817
echo "compile ok"

0 commit comments

Comments
 (0)