Skip to content

Commit 1cb2fcc

Browse files
author
Josh Milthorpe
committed
update to APGAS 1.0.0, Akka 2.4.1
1 parent 545c6ed commit 1cb2fcc

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ Things work better if you use Eclipse. Somehow, the classpaths don't get set up
1010
in the same way when using sbt or starting from a shell.
1111

1212
- Eclipse >= 4.4 ("Luna")
13-
- The `apgas` and `apgas.impl` projects from the [X10 SVN
14-
repository](http://sourceforge.net/p/x10/code/HEAD/tree/trunk/).
15-
- Hazelcast (see `INSTALL.txt` in `apgas.impl`).
13+
- The `apgas` project from the [X10 Git repository](https://github.com/x10-lang/x10).
14+
- Hazelcast (will be installed in apgas/lib by running [Ant](http://ant.apache.org) in the apgas project).
1615
- The [Scala IDE](http://scala-ide.org/download/current.html) Eclipse plugins.
1716

1817
Constructs
@@ -48,7 +47,7 @@ Projects that only use `async` and `finish` (i.e. no distribution) will work jus
4847

4948
Licensing Terms
5049
---------------
51-
(C) Copyright IBM Corporation 2015.
50+
(C) Copyright IBM Corporation 2015-2016.
5251

5352
This program is controlled by the Eclipse Public Licence v1.0.
5453
You may obtain a copy of the License at

apgas.scala.examples/.classpath

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="resources"/>
54
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
65
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
76
<classpathentry combineaccessrules="false" kind="src" path="/apgas"/>
8-
<classpathentry combineaccessrules="false" kind="src" path="/apgas.impl"/>
97
<classpathentry combineaccessrules="false" kind="src" path="/apgas.scala"/>
108
<classpathentry combineaccessrules="false" kind="src" path="/apgas.examples"/>
11-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-actor_2.11-2.3.9.jar"/>
12-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-cluster_2.11-2.3.9.jar"/>
13-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-remote_2.11-2.3.9.jar"/>
14-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/config-1.2.1.jar"/>
15-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/netty-3.8.0.Final.jar"/>
16-
<classpathentry kind="var" path="AKKA_HOME/lib/akka/protobuf-java-2.5.0.jar"/>
9+
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-actor_2.11-2.4.1.jar"/>
10+
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-cluster_2.11-2.4.1.jar"/>
11+
<classpathentry kind="var" path="AKKA_HOME/lib/akka/akka-remote_2.11-2.4.1.jar"/>
12+
<classpathentry kind="var" path="AKKA_HOME/lib/akka/config-1.3.0.jar"/>
13+
<classpathentry kind="var" path="AKKA_HOME/lib/akka/netty-3.10.3.Final.jar"/>
14+
<classpathentry kind="var" path="AKKA_HOME"/>
1715
<classpathentry kind="output" path="bin"/>
1816
</classpath>

apgas.scala/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/apgas"/>
7-
<classpathentry combineaccessrules="false" kind="src" path="/apgas.impl"/>
87
<classpathentry kind="output" path="bin"/>
98
</classpath>

apgas.scala/src/apgas/scala/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ package object scala {
5353
}
5454

5555
def asyncAt(place : Place)(body : =>Unit) : Unit = {
56-
Constructs.asyncat(place, new SerializableJob() {
56+
Constructs.asyncAt(place, new SerializableJob() {
5757
override def run() : Unit = {
5858
body
5959
}
6060
})
6161
}
6262

6363
def uncountedAsyncAt(place : Place)(body : =>Unit) : Unit = {
64-
Constructs.uncountedasyncat(place, new SerializableJob() {
64+
Constructs.uncountedAsyncAt(place, new SerializableJob() {
6565
override def run() : Unit = {
6666
body
6767
}

0 commit comments

Comments
 (0)