Skip to content

Commit

Permalink
update to Apache Royale 0.9.12 (closes #754) (closes #747) (closes #724
Browse files Browse the repository at this point in the history
…) (closes #701) (closes #697) (closes #475) (closes #467)
  • Loading branch information
joshtynjala committed Dec 9, 2024
1 parent ec5b637 commit 88697ad
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion check-royale-version/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class CheckRoyaleVersion {

private static final int MIN_MAJOR = 0;
private static final int MIN_MINOR = 9;
private static final int MIN_REVISION = 10;
private static final int MIN_REVISION = 12;

public static void main(String[] args) {
try {
Expand Down
1 change: 1 addition & 0 deletions distribution/src/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<include>linter-*.jar</include>
<include>antlr-*.jar</include>
<include>guava-*.jar</include>
<include>failureaccess-*.jar</include>
<include>jburg-*.jar</include>
<include>jflex-*.jar</include>
<include>lzma-sdk-*.jar</include>
Expand Down
8 changes: 4 additions & 4 deletions language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,25 @@ limitations under the License.
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-jx</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>formatter</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>linter</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions rcsh/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ limitations under the License.
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-jx</artifactId>
<version>0.9.10</version>
<version>0.9.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion vscode-extension/src/main/ts/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import selectRoyalePreferredTarget from "./commands/selectRoyalePreferredTarget"
import getRoyalePreferredTarget from "./utils/getRoyalePreferredTarget";
import validateRoyale from "./utils/validateRoyale";

const MINIMUM_APACHE_ROYALE_VERSION = "0.9.10";
const MINIMUM_APACHE_ROYALE_VERSION = "0.9.12";
const MINIMUM_JDK_VERSION = "11";
const INVALID_SDK_ERROR = `as3mxml.sdk.editor in settings does not point to a valid SDK. Requires Apache Royale ${MINIMUM_APACHE_ROYALE_VERSION} or newer.`;
const INVALID_JAVA_ERROR = `as3mxml.java.path in settings does not point to a valid executable. It cannot be a directory, and Java JDK ${MINIMUM_JDK_VERSION} or newer is required.`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ interface ActionScriptTaskDefinition extends vscode.TaskDefinition {
watch?: boolean;
}

const MINIMUM_APACHE_ROYALE_VERSION = "0.9.10";
const WATCH_MINIMUM_APACHE_ROYALE_VERSION = "0.9.10";

export default class ActionScriptTaskProvider
extends BaseAsconfigTaskProvider
Expand Down Expand Up @@ -304,7 +304,7 @@ export default class ActionScriptTaskProvider
)
);

if (validateRoyale(frameworkSDK, MINIMUM_APACHE_ROYALE_VERSION)) {
if (validateRoyale(frameworkSDK, WATCH_MINIMUM_APACHE_ROYALE_VERSION)) {
result.push(
this.getWatchTask(
`${TASK_NAME_WATCH} - ${taskNameSuffix}`,
Expand Down

0 comments on commit 88697ad

Please sign in to comment.