Skip to content

Commit

Permalink
Removed LibGDX deps for 1.95.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@tommyettinger
tommyettinger committed Aug 6, 2013
1 parent 19d24eb commit 24a9d21
Show file tree
Hide file tree
Showing 45 changed files with 1,665 additions and 1,797 deletions.
93 changes: 62 additions & 31 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@

<groupId>com.squidpony</groupId>
<artifactId>squidlib</artifactId>
<version>1.95</version>
<version>1.95.1</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -57,12 +57,6 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<encoding>UTF-8</encoding>
</properties>
<repositories>
<repository>
<id>gdx-nightlies</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
Expand All @@ -75,20 +69,6 @@
</configuration>
</plugin>

<plugin>
<groupId>com.googlecode.mavennatives</groupId>
<artifactId>maven-nativedependencies-plugin</artifactId>
<version>0.0.7</version>
<executions>
<execution>
<id>unpacknatives</id>
<goals>
<goal>copy</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand All @@ -103,18 +83,69 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>package-jars</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
<configuration>
<includePom>true</includePom>
</configuration>
</execution>
</executions>
<configuration>
<includePom>true</includePom>
</configuration>
</plugin>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<inherited>true</inherited>
<executions>
<execution>
<id>package-jars</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
<configuration>
<includePom>true</includePom>
</configuration>
</execution>
</executions>
<configuration>
<debug>true</debug>
<minmemory>128m</minmemory>
<maxmemory>1024m</maxmemory>
<quiet>true</quiet>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.name} ${project.version}</windowtitle>
<testDoctitle>${project.name} ${project.version} (TEST API)</testDoctitle>
<testWindowtitle>${project.name} ${project.version} (TEST API)</testWindowtitle>
<splitindex>true</splitindex>
<encoding>${project.build.sourceEncoding}</encoding>
<links>
<link>http://java.sun.com/j2se/1.6.0/docs/api</link>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/j2se/1.4.2/docs/api</link>
<link>http://java.sun.com/j2ee/1.4/docs/api</link>
</links>
<linksource>true</linksource>
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
</plugin>

</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId>
<version>0.9.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-backend-lwjgl</artifactId>
<version>0.9.9-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
120 changes: 120 additions & 0 deletions pom.xml.releaseBackup
View file
@@ -0,0 +1,120 @@
<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>

<groupId>com.squidpony</groupId>
<artifactId>squidlib</artifactId>
<version>1.95-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<name>SquidLib</name>
<description>Please refer to https://github.com/SquidPony/SquidLib .</description>

<url>https://github.com/SquidPony/SquidLib</url>

<developers>
<developer>
<name>Eben Howard ( https://github.com/SquidPony )</name>
<email>example@example.com</email>
</developer>
</developers>

<licenses>
<license>
<name>Apache Public License</name>
<url>
https://www.apache.org/licenses/LICENSE-2.0.html
</url>
<comments>LICENSE.txt</comments>
<distribution>repo</distribution>
</license>
</licenses>

<inceptionYear>2012</inceptionYear>

<prerequisites>
<maven>3.0.3</maven>
</prerequisites>

<issueManagement>
<url>https://github.com/SquidPony/SquidLib/issues</url>
<system>GitHub Issues</system>
</issueManagement>

<scm>
<connection>scm:git:git@github.com:tommyettinger/SquidLib.git</connection>
<developerConnection>scm:git:git@github.com:tommyettinger/SquidLib.git</developerConnection>
<url>git@github.com:tommyettinger/SquidLib.git</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<encoding>UTF-8</encoding>
</properties>
<repositories>
<repository>
<id>gdx-nightlies</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>

<plugin>
<groupId>com.googlecode.mavennatives</groupId>
<artifactId>maven-nativedependencies-plugin</artifactId>
<version>0.0.7</version>
<executions>
<execution>
<id>unpacknatives</id>
<goals>
<goal>copy</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId>
<version>0.9.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-backend-lwjgl</artifactId>
<version>0.9.9-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
21 changes: 21 additions & 0 deletions release.properties
View file
@@ -0,0 +1,21 @@
#release configuration
#Fri Jul 26 03:48:22 PDT 2013
scm.commentPrefix=[maven-release-plugin]
pushChanges=true
dependency.dependency.com.badlogicgames.gdx\:gdx.development=0.9.9-SNAPSHOT
project.scm.com.squidpony\:squidlib.tag=HEAD
dependency.dependency.com.badlogicgames.gdx\:gdx.release=0.9.9-SNAPSHOT
scm.tag=squidlib-1.95
project.dev.com.squidpony\:squidlib=1.96-SNAPSHOT
remoteTagging=true
exec.additionalArguments=-Psonatype-oss-release
project.scm.com.squidpony\:squidlib.developerConnection=scm\:git\:git@github.com\:tommyettinger/SquidLib.git
project.scm.com.squidpony\:squidlib.url=git@github.com\:tommyettinger/SquidLib.git
scm.url=scm\:git\:git@github.com\:tommyettinger/SquidLib.git
preparationGoals=clean verify
dependency.dependency.com.badlogicgames.gdx\:gdx-backend-lwjgl.development=0.9.9-SNAPSHOT
scm.username=tommyettinger
project.rel.com.squidpony\:squidlib=1.95
dependency.dependency.com.badlogicgames.gdx\:gdx-backend-lwjgl.release=0.9.9-SNAPSHOT
project.scm.com.squidpony\:squidlib.connection=scm\:git\:git@github.com\:tommyettinger/SquidLib.git
completedPhase=run-preparation-goals
27 changes: 27 additions & 0 deletions src/main/java/squidpony/annotation/Beta.java
View file
@@ -0,0 +1,27 @@
package squidpony.annotation;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Signifies that a public API (public class, method or field) is subject to
* incompatible changes, or even removal, in a future release. An API bearing
* this annotation is exempt from any compatibility guarantees made by its
* containing library.
*
* @author Kevin Bourrillion
*/
@Retention(RetentionPolicy.CLASS)
@Target({
ElementType.ANNOTATION_TYPE,
ElementType.CONSTRUCTOR,
ElementType.FIELD,
ElementType.METHOD,
ElementType.TYPE})
@Documented
@Beta
public @interface Beta {
}
8 changes: 8 additions & 0 deletions src/main/java/squidpony/package.html
View file
@@ -0,0 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<body bgcolor="white">
<p>
This is the base package for all components of the SquidLib Library.
</p>
</body>
</html>
56 changes: 17 additions & 39 deletions src/main/java/squidpony/squidcolor/SColor.java
View file
@@ -1,19 +1,19 @@
package squidpony.squidcolor;

import java.awt.Color;
import java.util.Objects;

/**
* Allows for the use of custom colors with custom names.
*
* These colors are comparable for equality but the ordering of them is based on
* their hex values.
*
* Has some built in pallets available as SColor arrays.
* Has some built in palettes available as SColor arrays.
*
* @author Eben Howard - http://squidpony.com
* @author Eben Howard - http://squidpony.com - howard@squidpony.com
*/
public class SColor extends Color implements Comparable {

public class SColor extends Color {
private String name = "Unnamed";
/**
* Color constant<PRE><font style="background-color: #f0f8ff;" color=000000>&nbsp&nbsp&nbsp</font><font style="background-color: #000000;" color=000000>&nbsp&nbsp&nbsp</font><font style="background-color: #888888;" color=000000>&nbsp&nbsp&nbsp</font><font style="background-color: #ffffff;" color=000000>&nbsp&nbsp&nbsp</font><font style="background-color: #f0f8ff;" color=000000>&nbsp@&nbsp</font>
Expand Down Expand Up @@ -5416,41 +5416,6 @@ public SColor(int r, int g, int b, String name) {
this.name = name;
}

/**
* Compares the current color to another color. Comparison is not guaranteed
* to lead to a logical color ordering that may be expected.
*
* @param color new color to compare with current color
* @return indicator of comparison between colors
*/
public int compareTo(SColor color) {
int compare = 0;//default to being equal
if (getRGB() < color.getRGB()) {
compare = -1;
} else if (getRGB() > color.getRGB()) {
compare = 1;
}
return compare;
}

/**
* Compares the current color to another object of any type. If the second
* object is not a SColor object than an exception will be thrown.
*
* @throws UnsupportedOperationException if second object not a SColor
* object
* @param arg0 second object to be compared to
* @return indicator of comparison between colors
*/
@Override
public int compareTo(Object arg0) {
try {
return compareTo((SColor) arg0);
} catch (Exception e) {
throw new UnsupportedOperationException("Incorrect Object Type");
}
}

@Override
public String toString() {
return name + " " + super.toString();
Expand All @@ -5459,4 +5424,17 @@ public String toString() {
public String getName() {
return name;
}

@Override
public boolean equals(Object other) {
return other instanceof SColor || other instanceof Color ? this.getRGB() == ((Color) other).getRGB() : false;
}

@Override
public int hashCode() {
int hash = 5;
hash = 31 * hash + Objects.hashCode(this.name);
hash += 31 * hash + Objects.hashCode(this.getRGB());
return hash;
}
}

0 comments on commit 24a9d21

Please sign in to comment.