Fixed issue where COM_QueryResponse would inadvertently detect a MySQ…

…L Error packet and then throw an error because it wasn't actually a MySQL Error Packet.
BoardiesITSolutions · Oct 22, 2023 · a600fa2 · a600fa2
1 parent 5ebc9dc
commit a600fa2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/AndroidMySQLConnector/build.gradle b/AndroidMySQLConnector/build.gradle
@@ -2,10 +2,14 @@
 
 buildscript {
     repositories {
+        apply plugin: 'maven-publish'
         if (rootProject.ext.publishToMavenLocal) {
-            apply plugin: 'maven-publish'
             mavenLocal()
         }
+        else
+        {
+            mavenCentral()
+        }
     }
 }
 
@@ -23,7 +27,7 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.49'
+version '0.52'
 group 'com.BoardiesITSolutions'
 
 
@@ -47,43 +51,51 @@ android {
     }
 
     println("Is publishToMavenLocal set? " + rootProject.ext.publishToMavenLocal)
-    if (rootProject.ext.publishToMavenLocal) {
-        android.libraryVariants
+    android.libraryVariants
 
-        project.afterEvaluate {
-            project.publishing {
-                publications {
-                    mavenJava(MavenPublication) {
-                        groupId 'com.BoardiesITSolutions'
-                        artifactId 'AndroidMySQLConnector'
-                        version '0.49'
-                        artifact("$buildDir/outputs/aar/AndroidMySQLConnector-release.aar")
-                    }
+    project.afterEvaluate {
+        project.publishing {
+            publications {
+                mavenJava(MavenPublication) {
+                    groupId 'com.BoardiesITSolutions'
+                    artifactId 'AndroidMySQLConnector'
+                    version '0.51'
+                    artifact("$buildDir/outputs/aar/AndroidMySQLConnector-release.aar")
                 }
-                repositories {
+            }
+            repositories {
+                if (rootProject.ext.publishToMavenLocal) {
                     mavenLocal()
                 }
+                else {
+                    mavenCentral()
+                }
             }
         }
+    }
 
-        libraryVariants.all { variant ->
-            variant.outputs.all { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${archivesBaseName}-${version}.aar"
-                    //def fileName = "${archivesBaseName}-debug.aar"
-                    //output.outputFile = new File(outputFile.parent, fileName)
-                    outputFileName = fileName
-                }
+    libraryVariants.all { variant ->
+        variant.outputs.all { output ->
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                def fileName = "${archivesBaseName}-${version}.aar"
+                //def fileName = "${archivesBaseName}-debug.aar"
+                //output.outputFile = new File(outputFile.parent, fileName)
+                outputFileName = fileName
             }
         }
     }
 
+
     repositories {
         if (rootProject.ext.publishToMavenLocal)
         {
             mavenLocal()
         }
+        else
+        {
+            mavenCentral()
+        }
         jcenter()
         maven {
             url "https://maven.google.com"

diff --git a/build.gradle b/build.gradle
@@ -10,10 +10,10 @@ buildscript {
 
 
     repositories {
+        apply plugin: 'maven-publish'
         if (publishToMavenLocal)
         {
             println("Top level build gradle. Using mavenLocal")
-            apply plugin: 'maven-publish'
             mavenLocal()
         }
         jcenter()