Skip to content
This repository has been archived by the owner on Dec 10, 2022. It is now read-only.

Commit

Permalink
#31 Fix maven pom.xml version crazyness
Browse files Browse the repository at this point in the history 
Added update_version.sh script to easily update jtransc version
Simplified pom.xml versions
Updated to 0.2.1
  • Loading branch information
@soywiz
soywiz committed Apr 26, 2016
1 parent 8f11f9d commit 0db7798
Show file tree
Hide file tree
Showing 18 changed files with 480 additions and 92 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
*.ipr
*.iml
*.jar
*.versionsBackup
*.java-e
/.idea/
/libs/
/out/
Expand Down
12 changes: 6 additions & 6 deletions inception/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>

<properties>
<jtransc.version>0.2.0</jtransc.version>
<kotlin.version>1.0.1-2</kotlin.version>
</properties>
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>com.jtransc</groupId>
<artifactId>jtransc-main-inception</artifactId>
<version>0.2.0</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
14 changes: 7 additions & 7 deletions jtransc-buildjar-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>com.jtransc</groupId>
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-buildjar-maven-plugin</artifactId>
<version>0.2.0</version>
<packaging>maven-plugin</packaging>

<properties>
<kotlin.version>1.0.1-2</kotlin.version>
<jtransc.version>0.2.0</jtransc.version>
</properties>

<!--
<name>Sample Parameter-less Maven Plugin</name>
-->
Expand Down
6 changes: 3 additions & 3 deletions jtransc-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-core</artifactId>
Expand Down Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-rt-core</artifactId>
<version>0.2.0</version>
<version>${jtransc.version}</version>
</dependency>
</dependencies>

Expand Down
110 changes: 110 additions & 0 deletions jtransc-core/pom.xml.versionsBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2016 Carlos Ballesteros Velasco
~
~ Licensed 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
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-core</artifactId>
<name>jtransc core</name>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${kotlin.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-utils</artifactId>
<version>${jtransc.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>5.0.4</version>
</dependency>
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-rt-core</artifactId>
<version>${jtransc.version}</version>
</dependency>
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-rt</artifactId>
<version>${jtransc.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-rt-core</artifactId>
<version>${jtransc.version}</version>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>testresources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>jtransc.MainKt</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>

</project>
4 changes: 2 additions & 2 deletions jtransc-debugger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-debugger</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jtransc-gen-haxe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-gen-haxe</artifactId>
Expand Down
11 changes: 8 additions & 3 deletions jtransc-main-run/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,20 @@

<modelVersion>4.0.0</modelVersion>

<groupId>com.jtransc</groupId>
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-main-run</artifactId>
<version>0.2.0</version>

<dependencies>
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-main</artifactId>
<version>0.2.0</version>
<version>${jtransc.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion jtransc-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
</parent>

<artifactId>jtransc-main</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions jtransc-maven-plugin/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>com.jtransc</groupId>
<artifactId>jtransc-maven-plugin-example</artifactId>
<version>0.2.0</version>
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>jtransc-maven-plugin-example</artifactId>
<!--
<packaging>maven-plugin</packaging>
<name>Sample Parameter-less Maven Plugin</name>
-->

<properties>
<kotlin.version>1.0.1-2</kotlin.version>
<jtransc.version>0.2.0</jtransc.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
14 changes: 7 additions & 7 deletions jtransc-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>com.jtransc</groupId>
<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<version>0.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jtransc-maven-plugin</artifactId>
<version>0.2.0</version>
<packaging>maven-plugin</packaging>

<properties>
<kotlin.version>1.0.1-2</kotlin.version>
<jtransc.version>0.2.0</jtransc.version>
</properties>

<!--
<name>Sample Parameter-less Maven Plugin</name>
-->
Expand Down
2 changes: 1 addition & 1 deletion jtransc-rt-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
</parent>

<artifactId>jtransc-rt-core</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion jtransc-rt-core/src/com/jtransc/JTranscVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import com.jtransc.annotation.haxe.HaxeMethodBody;

public class JTranscVersion {
static private final String version = "0.2.1";

static public String getVersion() {
return "0.2.0";
return version;
}

@HaxeMethodBody("return HaxeNatives.str('haxe');")
Expand Down
33 changes: 17 additions & 16 deletions jtransc-rt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,12 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<modelVersion>4.0.0</modelVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources><resource><directory>resources</directory></resource></resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<parent>
<groupId>com.jtransc</groupId>
<artifactId>jtransc</artifactId>
<relativePath>..</relativePath>
<version>0.2.0</version>
<version>0.2.1</version>
</parent>

<artifactId>jtransc-rt</artifactId>
Expand All @@ -48,7 +34,22 @@
<dependency>
<groupId>com.jtransc</groupId>
<artifactId>jtransc-rt-core</artifactId>
<version>${jtransc.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<resources><resource><directory>resources</directory></resource></resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 0db7798

Please sign in to comment.