From c15d22e7c703cc6f37f3680ce70d545060fb0963 Mon Sep 17 00:00:00 2001
From: Schuemie <MSCHUEMI@its.jnj.com>
Date: Fri, 21 Jan 2022 10:00:45 +0100
Subject: [PATCH] Increasing version number

---
 DESCRIPTION      |  4 ++--
 NEWS.md          | 22 ++++++++++++++++++++++
 compare_versions | 31 +++----------------------------
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 5eeb006..8942efe 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: Hades
 Type: Package
 Title: Health Analytics Data-to-Evidence Suite
-Version: 1.1.0
-Date: 2021-12-17
+Version: 1.2.0
+Date: 2022-01-21
 Authors@R: c(
   person("Martijn", "Schuemie", , "schuemie@ohdsi.org", role = c("aut", "cre")),
   person("Observational Health Data Science and Informatics", role = c("cph"))
diff --git a/NEWS.md b/NEWS.md
index 5f24452..2e1342d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,25 @@
+HADES 1.2.0
+===========
+
+Changes
+
+- Adding Capr to HADES
+
+HADES 1.1.0
+===========
+
+Changes
+
+- Adding CohortGenerator to HADES
+
+HADES 1.0.1
+===========
+
+Changes
+
+- Moving Eunomia from CRAN to GitHub
+
+
 Hades 1.0.0
 ===========
 
diff --git a/compare_versions b/compare_versions
index 75f6e23..54e5fea 100644
--- a/compare_versions
+++ b/compare_versions
@@ -9,8 +9,6 @@ $r_major = $1;
 $r_minor = $2;
 $r_mod = $3;
 
-print "New R version: $r_major-$r_minor-$r_mod\n";
-
 open(GIT_VERSION, "git describe --tags |");
 $git = <GIT_VERSION>;
 close(GIT_VERSION);
@@ -20,33 +18,10 @@ $git_major = $1;
 $git_minor = $2;
 $git_mod = $3;
 
-print "Current git version: $git_major-$git_minor-$git_mod\n";
-
 if ($r_major > $git_major || $r_minor > $git_minor || $r_mod > $git_mod) {
-	$monotonic = 0;
+	$new_version = "v$r_major.$r_minor.$r_mod";
 } else {
-	$monotonic = -1;
-}
-
-if ($monotonic != 0) {
-	print "Non-monotonically increasing versions numbers\n";
-}
-
-if ($monotonic == 0 & $ARGV[0] eq "--tag") {
-
-	$cmd = "git config user.name \"Martijn Schuemie\"; " .
-	       "git config user.email \"schuemie@ohdsi.org\"; " .
-	       "git tag v$r_major.$r_minor.$r_mod ; " .
-	       "git push -q https://\$GH_TOKEN\@github.com/\$GITHUB_REPOSITORY.git --tags";
-
-	print "cmd: $cmd\n"; 
-
-	open(GIT_PUSH, "$cmd |");
-	while ($line = <GIT_PUSH>) {
-		print "push: $line";
-	} # TODO Check for errors
-	close(GIT_PUSH);
-	print "push: END\n\n";
+	$new_version = "";
 }
 
-exit($monotonic);
+print($new_version);