You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/01/08 21:36:15 UTC
[royale-asjs] branch develop updated: distribution: fix for wrong
compiler jar version in commit b8d136a1644f5de2a14b9185c48637e1089313b4
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 6bfcdfd distribution: fix for wrong compiler jar version in commit b8d136a1644f5de2a14b9185c48637e1089313b4
6bfcdfd is described below
commit 6bfcdfde8a8bb932c823d9538103ceb28322a7af
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Jan 8 13:36:00 2021 -0800
distribution: fix for wrong compiler jar version in commit b8d136a1644f5de2a14b9185c48637e1089313b4
---
distribution/pom.xml | 220 +++++++++++++++++++++++++--------------------------
1 file changed, 110 insertions(+), 110 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 559f0ed..aed4c25 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
+<!--
+
+ 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.
+
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -331,11 +331,11 @@
<!-- Fonts -->
<!-- Disabled as currently font swf compilation is deactivated -->
<!-- Update the version when re-enabling -->
- <!--dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Fonts</artifactId>
- <version>x.x.x-SNAPSHOT</version>
- <type>swf</type>
+ <!--dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Fonts</artifactId>
+ <version>x.x.x-SNAPSHOT</version>
+ <type>swf</type>
</dependency-->
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -348,47 +348,47 @@
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>mxmlc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-asc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-compc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-mxmlc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-compjsc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-mxmljsc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-optimizer</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
<artifactId>compiler-swfdump</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>${royale.compiler.version}</version>
</dependency>
<!-- google closure compiler and library will be needed unpacked in js/lib/google -->
@@ -786,11 +786,11 @@
<type>zip</type>
</dependency>
- <!-- <dependency>
- <groupId>com.adobe</groupId>
- <artifactId>fontkit</artifactId>
- <version>1.0</version>
- </dependency>
+ <!-- <dependency>
+ <groupId>com.adobe</groupId>
+ <artifactId>fontkit</artifactId>
+ <version>1.0</version>
+ </dependency>
-->
<dependency>
<groupId>com.adobe.air</groupId>
@@ -862,80 +862,80 @@
</plugins>
</build>
</profile>
- <!-- <profile>
- <id>_os-windows</id>
- <activation>
- <os>
- <family>Windows</family>
- </os>
- <property>
- <name>distributionTargetFolder</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>adl</artifactId>
- <version>${air.version}</version>
- <classifier>win</classifier>
- <type>exe</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air.compiler</groupId>
- <artifactId>adt</artifactId>
- <version>${air.version}</version>
- <classifier>win</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>air</artifactId>
- <version>${air.version}</version>
- <classifier>win</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>air-captive</artifactId>
- <version>${air.version}</version>
- <classifier>win</classifier>
- <type>zip</type>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>_os-mac</id>
- <activation>
- <os>
- <family>Mac</family>
- </os>
- <property>
- <name>distributionTargetFolder</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>adl</artifactId>
- <version>${air.version}</version>
- <classifier>mac</classifier>
- <type>exe</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>air</artifactId>
- <version>${air.version}</version>
- <classifier>mac</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air.runtime</groupId>
- <artifactId>air-captive</artifactId>
- <version>${air.version}</version>
- <classifier>mac</classifier>
- <type>zip</type>
- </dependency>
- </dependencies>
+ <!-- <profile>
+ <id>_os-windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ <property>
+ <name>distributionTargetFolder</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>adl</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>exe</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air-captive</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>_os-mac</id>
+ <activation>
+ <os>
+ <family>Mac</family>
+ </os>
+ <property>
+ <name>distributionTargetFolder</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>adl</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>exe</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air-captive</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
</profile> -->
</profiles>
</project>