From 2afbc7d386b1951546604b8eeaf3e13c9d7ee038 Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 12:54:13 -0800
Subject: [PATCH 1/6] Upgraded checkstyle and java version.

---
 cadc-quality/build.gradle                           | 6 +++---
 cadc-quality/src/main/resources/cadc_checkstyle.xml | 9 ++++-----
 opencadc.gradle                                     | 6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle
index 6a1d6fa0..480edc54 100644
--- a/cadc-quality/build.gradle
+++ b/cadc-quality/build.gradle
@@ -11,11 +11,11 @@ repositories {
 
 apply from: '../opencadc.gradle'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 group = 'org.opencadc'
 
-version = '1.0'
+version = '1.1'
 
 description = 'OpenCADC Checkstyle Code Quality Rules'
 def git_url = 'https://github.com/opencadc/core'
@@ -23,7 +23,7 @@ def git_url = 'https://github.com/opencadc/core'
 checkstyle {
     ignoreFailures = false
     configFile = file("${projectDir}/src/main/resources/cadc_checkstyle.xml") 
-    toolVersion = '8.2'
+    toolVersion = '10.12.5'
     sourceSets = [project.sourceSets.test]
 }
 
diff --git a/cadc-quality/src/main/resources/cadc_checkstyle.xml b/cadc-quality/src/main/resources/cadc_checkstyle.xml
index 7f4d448b..a7cd8bf5 100644
--- a/cadc-quality/src/main/resources/cadc_checkstyle.xml
+++ b/cadc-quality/src/main/resources/cadc_checkstyle.xml
@@ -33,7 +33,10 @@
         <module name="FileTabCharacter">
             <property name="eachLine" value="true"/>
         </module>
-
+    <module name="LineLength">
+        <property name="max" value="160"/> <!--cadc changed from 100 -->
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -46,10 +49,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="160"/> <!--cadc changed from 100 -->
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
diff --git a/opencadc.gradle b/opencadc.gradle
index 695e1790..07abec54 100644
--- a/opencadc.gradle
+++ b/opencadc.gradle
@@ -7,14 +7,14 @@ configurations {
 }
 
 dependencies {
-    testImplementation 'com.puppycrawl.tools:checkstyle:8.2'
+    testImplementation 'com.puppycrawl.tools:checkstyle:10.12.5'
     checkstyleDep 'org.opencadc:cadc-quality:[1.0,)'
 }
 
 checkstyle {
     ignoreFailures = false
     config = resources.text.fromArchiveEntry(configurations.checkstyleDep, 'cadc_checkstyle.xml')
-    toolVersion = '8.2'
+    toolVersion = '10.12.5'
     sourceSets = []
 }
 
@@ -34,7 +34,7 @@ sourceSets {
 tasks.withType(Checkstyle).each { checkstyleTask ->
     checkstyleTask.doLast {
         reports.all { report ->
-            def outputFile = report.destination
+            def outputFile = report.outputLocation.get().asFile
             if (outputFile.exists() && outputFile.text.contains("<error ")) {
                 throw new GradleException("There were checkstyle warnings! For more info check $outputFile")
             }

From b8d55e5aac35a98222a94e253677e17289a88145 Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 16:11:12 -0800
Subject: [PATCH 2/6] Revert checkstyle and java version. Keeping the fix.

---
 cadc-quality/build.gradle                           | 2 +-
 cadc-quality/src/main/resources/cadc_checkstyle.xml | 9 +++++----
 opencadc.gradle                                     | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle
index 480edc54..370bf2b0 100644
--- a/cadc-quality/build.gradle
+++ b/cadc-quality/build.gradle
@@ -23,7 +23,7 @@ def git_url = 'https://github.com/opencadc/core'
 checkstyle {
     ignoreFailures = false
     configFile = file("${projectDir}/src/main/resources/cadc_checkstyle.xml") 
-    toolVersion = '10.12.5'
+    toolVersion = '8.2'
     sourceSets = [project.sourceSets.test]
 }
 
diff --git a/cadc-quality/src/main/resources/cadc_checkstyle.xml b/cadc-quality/src/main/resources/cadc_checkstyle.xml
index a7cd8bf5..7f4d448b 100644
--- a/cadc-quality/src/main/resources/cadc_checkstyle.xml
+++ b/cadc-quality/src/main/resources/cadc_checkstyle.xml
@@ -33,10 +33,7 @@
         <module name="FileTabCharacter">
             <property name="eachLine" value="true"/>
         </module>
-    <module name="LineLength">
-        <property name="max" value="160"/> <!--cadc changed from 100 -->
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -49,6 +46,10 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
+        <module name="LineLength">
+            <property name="max" value="160"/> <!--cadc changed from 100 -->
+            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
diff --git a/opencadc.gradle b/opencadc.gradle
index 07abec54..62990289 100644
--- a/opencadc.gradle
+++ b/opencadc.gradle
@@ -7,14 +7,14 @@ configurations {
 }
 
 dependencies {
-    testImplementation 'com.puppycrawl.tools:checkstyle:10.12.5'
-    checkstyleDep 'org.opencadc:cadc-quality:[1.0,)'
+    testImplementation 'com.puppycrawl.tools:checkstyle:8.2'
+    checkstyleDep 'org.opencadc:cadc-quality:[1.0,1.1,)'
 }
 
 checkstyle {
     ignoreFailures = false
     config = resources.text.fromArchiveEntry(configurations.checkstyleDep, 'cadc_checkstyle.xml')
-    toolVersion = '10.12.5'
+    toolVersion = '8.2'
     sourceSets = []
 }
 

From 7ca168022b224beab028bd9bce91b61aa4fcc03e Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 16:15:16 -0800
Subject: [PATCH 3/6] Small change.

---
 opencadc.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opencadc.gradle b/opencadc.gradle
index 62990289..97de9a6e 100644
--- a/opencadc.gradle
+++ b/opencadc.gradle
@@ -8,7 +8,7 @@ configurations {
 
 dependencies {
     testImplementation 'com.puppycrawl.tools:checkstyle:8.2'
-    checkstyleDep 'org.opencadc:cadc-quality:[1.0,1.1,)'
+    checkstyleDep 'org.opencadc:cadc-quality:[1.0,)'
 }
 
 checkstyle {

From 2edaa92e6eb87a47edf5081cde13a1edb4ee3393 Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 16:17:38 -0800
Subject: [PATCH 4/6] Small change.

---
 opencadc.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opencadc.gradle b/opencadc.gradle
index 97de9a6e..a2ea6557 100644
--- a/opencadc.gradle
+++ b/opencadc.gradle
@@ -8,7 +8,7 @@ configurations {
 
 dependencies {
     testImplementation 'com.puppycrawl.tools:checkstyle:8.2'
-    checkstyleDep 'org.opencadc:cadc-quality:[1.0,)'
+    checkstyleDep 'org.opencadc:cadc-quality:[1.0,1.1)'
 }
 
 checkstyle {

From d54f445ed3252f814acceda3017a0d1d2bc7dcd5 Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 16:21:54 -0800
Subject: [PATCH 5/6] Small change.

---
 cadc-quality/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle
index 370bf2b0..b52df2ae 100644
--- a/cadc-quality/build.gradle
+++ b/cadc-quality/build.gradle
@@ -11,7 +11,7 @@ repositories {
 
 apply from: '../opencadc.gradle'
 
-sourceCompatibility = 11
+sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 

From ec06e43f1c6a3dd08efd44cf7b62abe95f500018 Mon Sep 17 00:00:00 2001
From: aratikakadiya <aratikakadiya97@gmail.com>
Date: Mon, 23 Feb 2026 16:23:31 -0800
Subject: [PATCH 6/6] Small change.

---
 cadc-quality/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle
index b52df2ae..68a76958 100644
--- a/cadc-quality/build.gradle
+++ b/cadc-quality/build.gradle
@@ -15,7 +15,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.1'
+version = '1.0.1'
 
 description = 'OpenCADC Checkstyle Code Quality Rules'
 def git_url = 'https://github.com/opencadc/core'