Update dependencies and auth

Author: altavir

build.gradle.kts

@@ -1,32 +1,31 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.21"
+    kotlin("jvm") version "1.6.10"
     application
-    id("org.openjfx.javafxplugin") version "0.0.8"
+    id("org.openjfx.javafxplugin") version "0.0.12"
     //id("org.beryx.jlink") version "2.17.1"
     //id("com.github.johnrengelman.shadow") version "5.2.0"
-    id("org.beryx.runtime") version "1.9.1"
+    id("org.beryx.runtime") version "1.12.7"
 }
 
 group = "ru.mipt.physics"
-version = "1.1.3"
+version = "1.1.4"
 
 val compileKotlin: KotlinCompile by tasks
 val compileJava: JavaCompile by tasks
-compileJava.destinationDir = compileKotlin.destinationDir
+compileJava.destinationDirectory.set(compileKotlin.destinationDirectory.get())
 
 compileKotlin.kotlinOptions {
     jvmTarget = "11"
 }
 
 application {
-    mainClassName = "ru.mipt.physics.survey.ReportAppKt"
+    mainClass.set("ru.mipt.physics.survey.ReportAppKt")
 }
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
@@ -35,12 +34,12 @@ dependencies {
     implementation("no.tornado:tornadofx:1.7.20") {
         exclude("org.jetbrains.kotlin")
     }
-    implementation("org.freemarker:freemarker:2.3.29")
-    implementation("com.google.api-client:google-api-client:1.30.10")
-    implementation("com.google.oauth-client:google-oauth-client-jetty:1.30.4")
-    implementation("com.google.apis:google-api-services-sheets:v4-rev612-1.25.0")
+    implementation("org.freemarker:freemarker:2.3.31")
+    implementation("com.google.api-client:google-api-client:1.33.2")
+    implementation("com.google.oauth-client:google-oauth-client-jetty:1.33.1")
+    implementation("com.google.apis:google-api-services-sheets:v4-rev20220308-1.32.1")
 
-    testImplementation("junit:junit:4.+")
+    testImplementation("junit:junit:4.13.2")
 }
 
 javafx {
@@ -50,13 +49,13 @@ javafx {
 runtime {
     imageZip.set(project.file("${project.buildDir}/image-zip/phys-survey.zip"))
     options.set(listOf("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages"))
-    modules.set(listOf("java.desktop", "jdk.unsupported", "java.scripting", "java.logging", "java.xml", "jdk.crypto.ec"))
+    modules.set(listOf("java.desktop", "jdk.unsupported", "java.scripting", "java.logging", "java.xml", "jdk.crypto.ec","jdk.httpserver"))
 
     jpackage {
         imageName = "mipt-physics-survey"
         skipInstaller = false
         installerName = "mipt-physics-survey"
         installerType = "msi"
-        installerOptions = listOf("--win-menu", "--win-shortcut", "--win-dir-chooser","--win-per-user-install")
+        installerOptions = listOf("--win-menu", "--win-shortcut", "--win-dir-chooser","--win-per-user-install", "--vendor", "MIPT-NPM")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/ru/mipt/physics/survey/SurveyData.kt

@@ -7,17 +7,15 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow
 import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
 import com.google.api.client.http.HttpTransport
-import com.google.api.client.json.jackson2.JacksonFactory
+import com.google.api.client.json.gson.GsonFactory
 import com.google.api.client.util.store.FileDataStoreFactory
 import com.google.api.services.sheets.v4.Sheets
 import com.google.api.services.sheets.v4.SheetsScopes
 import java.io.*
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
-import java.util.*
 import java.util.logging.Level
 import java.util.logging.Logger
-import kotlin.collections.ArrayList
 
 
 const val lectureFunKey = "Увлекательность подачи материала"
@@ -72,19 +70,17 @@ object SurveyData {
      * Update data from server
      */
     fun update(callback: UpdateCallback) {
-        synchronized(this) {
-            callback.notifyUpdateInProgress(true)
-            try {
-                callback.notifyUpdateMessage("Загрузка данных с сервера")
-                val newEntries = Connection.download(entries.size)
-                entries.addAll(newEntries)
-                callback.notifyUpdateMessage("Загружено ${newEntries.size} новых записи с сервера")
-                if (newEntries.isNotEmpty()) {
-                    save()
-                }
-            } finally {
-                callback.notifyUpdateInProgress(false)
+        callback.notifyUpdateInProgress(true)
+        try {
+            callback.notifyUpdateMessage("Загрузка данных с сервера")
+            val newEntries = Connection.download(entries.size)
+            entries.addAll(newEntries)
+            callback.notifyUpdateMessage("Загружено ${newEntries.size} новых записи с сервера")
+            if (newEntries.isNotEmpty()) {
+                save()
             }
+        } finally {
+            callback.notifyUpdateInProgress(false)
         }
     }
 
@@ -120,7 +116,7 @@ object SurveyData {
 
     private fun save() {
         synchronized(this) {
-            if (!entries.isEmpty()) {
+            if (entries.isNotEmpty()) {
                 val file = File(STORE_FILE_NAME)
                 try {
                     ObjectOutputStream(file.outputStream()).use {
@@ -155,7 +151,7 @@ private object Connection {
     private val DATA_STORE_FACTORY: FileDataStoreFactory = FileDataStoreFactory(DATA_STORE_DIR)
 
     /** Global instance of the JSON factory.  */
-    private val JSON_FACTORY = JacksonFactory.getDefaultInstance()
+    private val JSON_FACTORY = GsonFactory.getDefaultInstance()
 
     /** Global instance of the HTTP transport.  */
     private val HTTP_TRANSPORT: HttpTransport = GoogleNetHttpTransport.newTrustedTransport()
@@ -165,7 +161,7 @@ private object Connection {
      * If modifying these scopes, delete your previously saved credentials
      * at ~/.credentials/sheets.googleapis.com-java-quickstart
      */
-    private val SCOPES = Arrays.asList(SheetsScopes.SPREADSHEETS_READONLY)
+    private val SCOPES = listOf(SheetsScopes.SPREADSHEETS_READONLY)
 
     /**
      * Build and return an authorized Sheets API client service.
@@ -187,7 +183,7 @@ private object Connection {
     @Throws(IOException::class)
     private fun authorize(): Credential {
         // Load client secrets.
-        val input = Connection::class.java.getResourceAsStream("/client_secret.json")
+        val input = Connection::class.java.getResourceAsStream("/client_secret.json")!!
         val clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, InputStreamReader(input))
 
         // Build flow and trigger user authorization request.
@@ -196,6 +192,7 @@ private object Connection {
         ).setDataStoreFactory(DATA_STORE_FACTORY)
             .setAccessType("offline")
             .build()
+
         val credential = AuthorizationCodeInstalledApp(
             flow, LocalServerReceiver()
         ).authorize("user")
@@ -252,7 +249,7 @@ private object Connection {
         }
     }
 
-    fun reset(){
+    fun reset() {
         DATA_STORE_DIR.takeIf { it.exists() }?.delete()
     }
 }