Merge pull request #373 from pengrad/kotlin-support

Add Kotlin

.github/workflows/pr.yml

@@ -20,4 +20,4 @@ jobs:
         cache: 'gradle'
 
     - name: Gradle PR Test
-      run: ./gradlew clean prTest
+      run: ./gradlew clean check -PprTest

library/build.gradle

@@ -1,7 +1,8 @@
 plugins {
     id "java-library"
+    id 'jacoco'
+    id "org.jetbrains.kotlin.jvm" version "1.9.22"
 }
-apply plugin: 'jacoco'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -10,6 +11,7 @@ dependencies {
     api 'com.google.code.gson:gson:2.10.1'
     api 'com.squareup.okhttp3:okhttp:4.12.0'
     api 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.13'
@@ -41,6 +43,14 @@ test {
     if (project.hasProperty('excludeTests')) {
         exclude project.property('excludeTests')
     }
+    if (project.hasProperty('prTest')) {
+        // TODO move "functional" tests into specific dir and exclude it
+        exclude '**/Base64Test.class'
+        exclude '**/CheckTelegramAuthTest.class'
+        exclude '**/PaymentsTest.class'
+        exclude '**/TelegramBotTest.class'
+        exclude '**/UpdatesListenerTest.class'
+    }
 }
 
 tasks.withType(Test).configureEach {
@@ -49,13 +59,4 @@ tasks.withType(Test).configureEach {
     }
 }
 
-tasks.register('prTest', Test) {
-    // TODO move "functional" tests into specific dir and exclude it
-    exclude '**/Base64Test.class'
-    exclude '**/CheckTelegramAuthTest.class'
-    exclude '**/PaymentsTest.class'
-    exclude '**/TelegramBotTest.class'
-    exclude '**/UpdatesListenerTest.class'
-}
-
 apply from: rootProject.file('gradle/gradle-publish-plugin.gradle')

library/src/main/java/com/pengrad/telegrambot/model/Audio.kt

@@ -0,0 +1,17 @@
+package com.pengrad.telegrambot.model
+
+/**
+ * stas
+ * 8/5/15.
+ */
+data class Audio(
+        @get:JvmName("fileId") val fileId: String? = null,
+        @get:JvmName("fileUniqueId") val fileUniqueId: String? = null,
+        @get:JvmName("duration") val duration: Int? = null,
+        @get:JvmName("performer") val performer: String? = null,
+        @get:JvmName("title") val title: String? = null,
+        @get:JvmName("fileName") val fileName: String? = null,
+        @get:JvmName("mimeType") val mimeType: String? = null,
+        @get:JvmName("fileSize") val fileSize: Long? = null,
+        @get:JvmName("thumbnail") val thumbnail: PhotoSize? = null,
+)

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScope.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+open class BotCommandScope(val type: String)

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllChatAdministrators.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandScopeAllChatAdministrators : BotCommandScope(type = "all_chat_administrators")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllGroupChats.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandScopeAllGroupChats : BotCommandScope(type = "all_group_chats")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllPrivateChats.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandScopeAllPrivateChats : BotCommandScope(type = "all_private_chats")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeDefault.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandScopeDefault : BotCommandScope(type = "default")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChat.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandsScopeChat(val chatId: Any) : BotCommandScope(type = "chat")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChatAdministrators.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandsScopeChatAdministrators(val chatId: Any) : BotCommandScope(type = "chat_administrators")

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChatMember.kt

@@ -0,0 +1,3 @@
+package com.pengrad.telegrambot.model.botcommandscope
+
+class BotCommandsScopeChatMember(val chatId: Any, val userId: Long) : BotCommandScope(type = "chat_member")

library/src/main/java/com/pengrad/telegrambot/model/request/CallbackGame.kt

@@ -0,0 +1,9 @@
+package com.pengrad.telegrambot.model.request
+
+/**
+ * Stas Parshin
+ * 04 June 2019
+ */
+object CallbackGame
+
+

library/src/main/java/com/pengrad/telegrambot/model/request/ChatAction.java → library/src/main/java/com/pengrad/telegrambot/model/request/ChatAction.kt

@@ -1,10 +1,11 @@
-package com.pengrad.telegrambot.model.request;
+package com.pengrad.telegrambot.model.request
 
 /**
  * stas
  * 10/21/15.
  */
-public enum ChatAction {
+@Suppress("EnumEntryName")
+enum class ChatAction {
     typing,
     upload_photo,
     record_video,