fix: EXPOSED-117 Set jvmToolchain to 8 for all modules (#1855)

* fix: EXPOSED-117 Set jvmToolchain to 8 for all modules
JetBrains · Sep 15, 2023 · e1f7ed3 · e1f7ed3
1 parent fa73510
commit e1f7ed3
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 2 deletions.
diff --git a/exposed-core/build.gradle.kts b/exposed-core/build.gradle.kts
@@ -8,6 +8,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(kotlin("stdlib"))
     api(kotlin("reflect"))

diff --git a/exposed-crypt/build.gradle.kts b/exposed-crypt/build.gradle.kts
@@ -6,6 +6,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api("org.springframework.security", "spring-security-crypto", "5.7.3")

diff --git a/exposed-dao/build.gradle.kts b/exposed-dao/build.gradle.kts
@@ -6,6 +6,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
 }
diff --git a/exposed-java-time/build.gradle.kts b/exposed-java-time/build.gradle.kts
@@ -10,6 +10,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     testImplementation(project(":exposed-dao"))

diff --git a/exposed-jdbc/build.gradle.kts b/exposed-jdbc/build.gradle.kts
@@ -6,6 +6,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
 }
diff --git a/exposed-jodatime/build.gradle.kts b/exposed-jodatime/build.gradle.kts
@@ -7,6 +7,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api("joda-time", "joda-time", "2.10.13")

diff --git a/exposed-json/build.gradle.kts b/exposed-json/build.gradle.kts
@@ -9,6 +9,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api("org.jetbrains.kotlinx", "kotlinx-serialization-json", Versions.kotlinxSerialization)

diff --git a/exposed-kotlin-datetime/build.gradle.kts b/exposed-kotlin-datetime/build.gradle.kts
@@ -10,6 +10,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api("org.jetbrains.kotlinx", "kotlinx-datetime-jvm", "0.4.0")

diff --git a/exposed-money/build.gradle.kts b/exposed-money/build.gradle.kts
@@ -6,6 +6,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api(project(":exposed-dao"))

diff --git a/exposed-spring-boot-starter/build.gradle.kts b/exposed-spring-boot-starter/build.gradle.kts
@@ -10,6 +10,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     api(project(":exposed-dao"))

diff --git a/exposed-tests/build.gradle.kts b/exposed-tests/build.gradle.kts
@@ -6,6 +6,10 @@ plugins {
     kotlin("jvm") apply true
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 repositories {
     mavenCentral()
 }
@@ -28,7 +32,7 @@ dependencies {
     implementation("org.apache.logging.log4j", "log4j-api", Versions.log4j2)
     implementation("org.apache.logging.log4j", "log4j-core", Versions.log4j2)
 
-    implementation("com.zaxxer", "HikariCP", "5.0.1")
+    implementation("com.zaxxer", "HikariCP", "4.0.3")
     testCompileOnly("org.postgresql", "postgresql", Versions.postgre)
     testCompileOnly("com.impossibl.pgjdbc-ng", "pgjdbc-ng", Versions.postgreNG)
     compileOnly("com.h2database", "h2", Versions.h2)

diff --git a/...c/test/kotlin/org/jetbrains/exposed/sql/tests/shared/functions/StatisticsFunctionTests.kt b/...c/test/kotlin/org/jetbrains/exposed/sql/tests/shared/functions/StatisticsFunctionTests.kt
@@ -44,6 +44,7 @@ class StatisticsFunctionTests : DatabaseTestsBase() {
     private object SampleTestTable : Table("sample_table") {
         val number = integer("number").nullable()
     }
+
     private val data: List<Int?> = listOf(4, null, 5, null, 6)
     private val scale = 4
 
@@ -63,7 +64,38 @@ class StatisticsFunctionTests : DatabaseTestsBase() {
     }
 
     private fun calculateStandardDeviation(isPopulation: Boolean): BigDecimal {
-        return calculateVariance(isPopulation).sqrt(MathContext(scale, RoundingMode.HALF_EVEN))
+        return calculateVariance(isPopulation).simpleSqrt()
+    }
+
+    fun BigDecimal.simpleSqrt(): BigDecimal {
+        if (this < BigDecimal.ZERO) throw ArithmeticException("Square root of negative number")
+        if (this == BigDecimal.ZERO) return BigDecimal.ZERO
+
+        val TWO = BigDecimal(2)
+        val EPSILON = BigDecimal(0.1).pow(scale)
+
+        var low = BigDecimal.ZERO
+        var high = max(BigDecimal.ONE)
+        var result = (low + high).divide(TWO)
+
+        while (true) {
+            val square = result.multiply(result)
+            val diff = square.subtract(this).abs()
+            if (diff < EPSILON) {
+                break
+            }
+
+            if (result.multiply(result) < this) {
+                low = result
+            } else {
+                high = result
+            }
+            result = (low + high).divide(TWO)
+        }
+
+        result = result.round(MathContext(scale, RoundingMode.HALF_EVEN))
+        result = result.setScale(scale)
+        return result
     }
 
     private fun calculateVariance(isPopulation: Boolean): BigDecimal {

diff --git a/spring-transaction/build.gradle.kts b/spring-transaction/build.gradle.kts
@@ -10,6 +10,10 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     api(project(":exposed-core"))
     implementation(project(":exposed-jdbc"))