chore: merge pull request #66 from Skythrew/kotlin

Clean everything up (Kotlin implementation)

build.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
-    alias(libs.plugins.androidLibrary).apply(false)
-    alias(libs.plugins.kotlinMultiplatform).apply(false)
+  alias(libs.plugins.androidLibrary).apply(false)
+  alias(libs.plugins.kotlinMultiplatform).apply(false)
 }

library/build.gradle.kts

@@ -1,102 +1,94 @@
+import com.vanniktech.maven.publish.SonatypeHost
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import com.vanniktech.maven.publish.SonatypeHost
 
 val libraryName = "Pawnote"
+
 version = "0.0.0"
 
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidLibrary)
-    id("com.vanniktech.maven.publish") version "0.29.0"
+  alias(libs.plugins.kotlinMultiplatform)
+  alias(libs.plugins.androidLibrary)
+  id("com.vanniktech.maven.publish") version "0.29.0"
 }
 
 kotlin {
-    jvm()
-    androidTarget {
-        publishLibraryVariants("release")
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
-        }
+  jvm()
+  androidTarget {
+    publishLibraryVariants("release")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
+  }
+
+  sourceSets {
+    val commonMain by getting {
+      dependencies {
+        implementation(libs.ktor.client.core)
+        implementation(libs.ktor.client.okhttp)
+
+        implementation(libs.kotlinx.serialization.json)
+        implementation(libs.kotlinx.serialization.core)
+
+        implementation(libs.kotlinx.datetime)
+      }
     }
-
-    sourceSets {
-        val commonMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.core)
-                implementation(libs.ktor.client.okhttp)
-
-                implementation(libs.kotlinx.serialization.json)
-                implementation(libs.kotlinx.serialization.core)
-
-                implementation(libs.kotlinx.datetime)
-            }
-        }
-        val commonTest by getting {
-            dependencies {
-                implementation(libs.kotlin.test)
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.okhttp)
-                implementation(libs.kotlin.test)
-            }
-        }
-        val androidMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.okhttp)
-            }
-        }
+    val commonTest by getting { dependencies { implementation(libs.kotlin.test) } }
+    val jvmMain by getting {
+      dependencies {
+        implementation(libs.ktor.client.okhttp)
+        implementation(libs.kotlin.test)
+      }
     }
+    val androidMain by getting {
+      dependsOn(jvmMain)
+      dependencies { implementation(libs.ktor.client.okhttp) }
+    }
+  }
 }
 
 val groupName = "ink.literate"
 val idLibraryName = libraryName.lowercase()
+
 group = groupName
 
 android {
-    namespace = groupName
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
+  namespace = groupName
+  compileSdk = libs.versions.android.compileSdk.get().toInt()
+  defaultConfig { minSdk = libs.versions.android.minSdk.get().toInt() }
 }
 
-
 mavenPublishing {
-    coordinates(groupName, idLibraryName, version.toString())
-
-    pom {
-        name = libraryName
-        description = "A purrfect API wrapper for PRONOTE."
-        inceptionYear = "2024"
-
-        url = "https://docs.literate.ink/$idLibraryName"
-
-        licenses {
-            license {
-                name.set("GPL-3.0-or-later")
-                url.set("https://www.gnu.org/licenses/gpl-3.0.txt")
-                distribution.set("https://www.gnu.org/licenses/gpl-3.0.txt")
-            }
-        }
-
-        developers {
-            developer {
-                organization = "LiterateInk"
-                organizationUrl = "https://literate.ink"
-            }
-        }
-
-        scm {
-            url = "https://github.com/LiterateInk/$libraryName"
-            connection = "scm:git:https://github.com/LiterateInk/$libraryName.git"
-            developerConnection = "scm:git:https://github.com/LiterateInk/$libraryName.git"
-        }
+  coordinates(groupName, idLibraryName, version.toString())
+
+  pom {
+    name = libraryName
+    description = "A purrfect API wrapper for PRONOTE."
+    inceptionYear = "2024"
+
+    url = "https://docs.literate.ink/$idLibraryName"
+
+    licenses {
+      license {
+        name.set("GPL-3.0-or-later")
+        url.set("https://www.gnu.org/licenses/gpl-3.0.txt")
+        distribution.set("https://www.gnu.org/licenses/gpl-3.0.txt")
+      }
+    }
+
+    developers {
+      developer {
+        organization = "LiterateInk"
+        organizationUrl = "https://literate.ink"
+      }
+    }
+
+    scm {
+      url = "https://github.com/LiterateInk/$libraryName"
+      connection = "scm:git:https://github.com/LiterateInk/$libraryName.git"
+      developerConnection = "scm:git:https://github.com/LiterateInk/$libraryName.git"
     }
+  }
 
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
-    signAllPublications()
+  publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
+  signAllPublications()
 }

library/src/commonMain/kotlin/ink/literate/pawnote/api/geolocation.kt

@@ -12,8 +12,8 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 
 suspend fun geolocation(
-  position: Position,
-  httpClient: HttpClient = HttpClient()
+    position: Position,
+    httpClient: HttpClient = HttpClient()
 ): List<GeolocatedInstance> {
   val res =
       httpClient.submitForm(

library/src/commonMain/kotlin/ink/literate/pawnote/api/session-information.kt

@@ -22,8 +22,8 @@ data class SessionInfoParams(
 )
 
 suspend fun sessionInformation(
-  options: SessionInfoParams,
-  httpClient: HttpClient = HttpClient { followRedirects = false }
+    options: SessionInfoParams,
+    httpClient: HttpClient = HttpClient { followRedirects = false }
 ): SessionInformation {
   val url = Url(options.base + "/" + encodeAccountKindToPath(options.kind))
 

library/src/commonMain/kotlin/ink/literate/pawnote/decoders/Instance.kt

@@ -17,7 +17,7 @@ fun decodeInstance(instance: JsonObject): Instance {
   return Instance(
       name = instance["nomEtab"]!!.jsonPrimitive.content,
       version = instance["version"]!!.jsonArray.map { version -> version.jsonPrimitive.int },
-      date = LocalDateTime.parse(instance["date"]!!.jsonPrimitive.content),
+      date = LocalDateTime.parse(instance["date"]!!.jsonPrimitive.content.dropLast(1)),
       accounts =
           instance["espaces"]!!.jsonArray.map { account ->
             InstanceAccount(

library/src/commonTest/kotlin/ink/literate/pawnote/core/ResponseFNTest.kt

@@ -18,7 +18,7 @@ class ResponseFNTest {
           id = sessionId,
           accountKind = AccountKind.STUDENT,
           aesIV = "09666dfddd5bbdacc8bb446df87530303130",
-          aesKey = "09666dfddd5bbdacc8bb446df87530303130",
+          aesKey = "",
           skipCompression = true,
           skipEncryption = true,
           demo = true,