Эх сурвалжийг харах

Update .gitignore to:

- Ignore Eclipse config files
- include resource folder
frans 8 жил өмнө
parent
commit
1fb42e819e
13 өөрчлөгдсөн 22 нэмэгдсэн , 55 устгасан
  1. 0 27
      .classpath
  2. 12 4
      .gitignore
  3. 0 23
      .project
  4. 10 1
      pom.xml
  5. BIN
      res/blue.png
  6. BIN
      res/brown.png
  7. BIN
      res/cyan.png
  8. BIN
      res/green.png
  9. BIN
      res/pink.png
  10. BIN
      res/red.png
  11. BIN
      res/steel.png
  12. BIN
      res/white.png
  13. BIN
      res/yellow.png

+ 0 - 27
.classpath

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

+ 12 - 4
.gitignore

@@ -1,4 +1,12 @@
-/bin/
-/target/
-/res/
-res
+.settings/
+.classpath
+.project
+
+tmp/
+*.tmp
+*.bak
+*.swp
+
+bin/
+target/
+.DS_Store

+ 0 - 23
.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Breakout</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

+ 10 - 1
pom.xml

@@ -24,6 +24,7 @@
 	</dependencies>
 
 	<build>
+		<finalName>${project.artifactId}-${project.version}.${build.number}</finalName>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -67,10 +68,18 @@
 				</executions>
 			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>res</directory>
+				<excludes>
+				</excludes>
+			</resource>
+		</resources>
 	</build>
-	
+
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<build.number>SNAPSHOT</build.number>
 	</properties>
 </project>

BIN
res/blue.png


BIN
res/brown.png


BIN
res/cyan.png


BIN
res/green.png


BIN
res/pink.png


BIN
res/red.png


BIN
res/steel.png


BIN
res/white.png


BIN
res/yellow.png