From 3503ef36116cbc527bb41b07c5224c0ba10a844e Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Thu, 11 May 2023 12:04:02 -0400
Subject: [PATCH] Improve git ignore in project templates

---
 .gitignore                                           | 12 ++++++------
 core                                                 |  2 +-
 .../templates/bld/base/project_gitignore.txt         |  6 +++---
 .../templates/bld/blank/project_gitignore.txt        |  6 +++---
 .../templates/bld/lib/project_gitignore.txt          |  6 +++---
 .../templates/bld/rife2_hello/project_gitignore.txt  |  6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53114a2..649fed5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,12 @@ embedded_dbs
 .DS_Store
 build
 lib/bld/**
-lib/compile/**
-lib/runtime/**
-lib/standalone/**
-lib/test/**
-!bld-wrapper.jar
-!bld-wrapper.properties
+!lib/bld/bld-wrapper.jar
+!lib/bld/bld-wrapper.properties
+lib/compile/
+lib/runtime/
+lib/standalone/
+lib/test/
 
 # IDEA ignores
 
diff --git a/core b/core
index a7e781f..840b862 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit a7e781fd85d7fcf61d3c864d109737cec6a15190
+Subproject commit 840b862d35c193c4b4dc5c82c2f9cebbbd50bf04
diff --git a/src/main/resources/templates/bld/base/project_gitignore.txt b/src/main/resources/templates/bld/base/project_gitignore.txt
index e448f8a..a2805aa 100644
--- a/src/main/resources/templates/bld/base/project_gitignore.txt
+++ b/src/main/resources/templates/bld/base/project_gitignore.txt
@@ -1,13 +1,13 @@
 .gradle
 .DS_Store
 build
+lib/bld/**
+!lib/bld/bld-wrapper.jar
+!lib/bld/bld-wrapper.properties
 lib/compile/
 lib/runtime/
 lib/standalone/
 lib/test/
-lib/bld/**
-!bld-wrapper.jar
-!bld-wrapper.properties
 
 # IDEA ignores
 
diff --git a/src/main/resources/templates/bld/blank/project_gitignore.txt b/src/main/resources/templates/bld/blank/project_gitignore.txt
index e448f8a..a2805aa 100644
--- a/src/main/resources/templates/bld/blank/project_gitignore.txt
+++ b/src/main/resources/templates/bld/blank/project_gitignore.txt
@@ -1,13 +1,13 @@
 .gradle
 .DS_Store
 build
+lib/bld/**
+!lib/bld/bld-wrapper.jar
+!lib/bld/bld-wrapper.properties
 lib/compile/
 lib/runtime/
 lib/standalone/
 lib/test/
-lib/bld/**
-!bld-wrapper.jar
-!bld-wrapper.properties
 
 # IDEA ignores
 
diff --git a/src/main/resources/templates/bld/lib/project_gitignore.txt b/src/main/resources/templates/bld/lib/project_gitignore.txt
index e448f8a..a2805aa 100644
--- a/src/main/resources/templates/bld/lib/project_gitignore.txt
+++ b/src/main/resources/templates/bld/lib/project_gitignore.txt
@@ -1,13 +1,13 @@
 .gradle
 .DS_Store
 build
+lib/bld/**
+!lib/bld/bld-wrapper.jar
+!lib/bld/bld-wrapper.properties
 lib/compile/
 lib/runtime/
 lib/standalone/
 lib/test/
-lib/bld/**
-!bld-wrapper.jar
-!bld-wrapper.properties
 
 # IDEA ignores
 
diff --git a/src/main/resources/templates/bld/rife2_hello/project_gitignore.txt b/src/main/resources/templates/bld/rife2_hello/project_gitignore.txt
index e448f8a..a2805aa 100644
--- a/src/main/resources/templates/bld/rife2_hello/project_gitignore.txt
+++ b/src/main/resources/templates/bld/rife2_hello/project_gitignore.txt
@@ -1,13 +1,13 @@
 .gradle
 .DS_Store
 build
+lib/bld/**
+!lib/bld/bld-wrapper.jar
+!lib/bld/bld-wrapper.properties
 lib/compile/
 lib/runtime/
 lib/standalone/
 lib/test/
-lib/bld/**
-!bld-wrapper.jar
-!bld-wrapper.properties
 
 # IDEA ignores