run all build steps by default

tomcz · Dec 12, 2023 · e7098cd · e7098cd
1 parent c7722a2
commit e7098cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ test.txt
 build
 out
 .idea/
-gradle.properties
 .classpath
 .project
 .settings/

diff --git a/Makefile b/Makefile
@@ -1,19 +1,12 @@
 GIT_TAG := $(shell git describe --tags 2>/dev/null)
 
-.PHONY: all
-all: clean test build-jar
-
-.PHONY: build-jar
-build-jar: clean
-	./gradlew --console plain -Pversion=${GIT_TAG} shadowJar
+ifeq "${GIT_TAG}" ""
+GIT_TAG := dev
+endif
 
-.PHONY: clean
-clean:
-	./gradlew --console plain clean
-
-.PHONY: test
-test:
-	./gradlew --console plain test
+.PHONY: all
+all:
+	./gradlew --console plain -Pversion=${GIT_TAG}
 
 .PHONY: deps
 deps:

diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,10 @@ repositories {
     mavenCentral()
 }
 
+defaultTasks 'clean', 'test', 'build', 'shadowJar'
+
+mainClassName = 'com.tomczarniecki.jpasskeep.Main'
+
 dependencies {
     implementation 'org.jdom:jdom:1.1.3'
     implementation 'com.jgoodies:forms:1.2.1'
@@ -19,5 +23,3 @@ dependencies {
     implementation 'net.sf.opencsv:opencsv:2.3'
     testImplementation 'junit:junit:4.10'
 }
-
-mainClassName = 'com.tomczarniecki.jpasskeep.Main'
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.daemon=false