chore: fix compileJava7 and compileJava6

Removal of LibPQFactory annotations was not done right
pgjdbc · Aug 28, 2020 · 0308ffc · 0308ffc
1 parent c745f4e
commit 0308ffc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pgjdbc/build.gradle.kts b/pgjdbc/build.gradle.kts
@@ -256,16 +256,17 @@ val hiddenAnnotation = Regex(
             "GuardedBy|UnderInitialization|" +
             "DefaultQualifier)(?:\\([^)]*\\))?")
 val hiddenImports = Regex("import org.checkerframework")
-val thisReferences = Regex("\\w+\\s+this\\s+,?")
+val thisReferences = Regex("""\*/\s+(\w+\s+this\b,?)""")
 
 val removeTypeAnnotations by tasks.registering(Sync::class) {
     destinationDir = withoutAnnotations
+    inputs.property("regexpsUpdatedOn", "2020-08-29")
     from(projectDir) {
         filteringCharset = `java.nio.charset`.StandardCharsets.UTF_8.name()
         filter { x: String ->
             x.replace(hiddenAnnotation, "/* $0 */")
                 .replace(hiddenImports, "// $0")
-                .replace(thisReferences, "/* $0 */")
+                .replace(thisReferences, "*/ /* $1 */")
         }
         include("src/**")
     }