Bump to Telegram Bot API 6.2

Contains breaking changes and fixes of TgBA
Cadiducho · Aug 21, 2022 · c6fc129 · c6fc129
1 parent da18974
commit c6fc129
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 25 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: Cadiducho
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,20 +1,55 @@
-name: Java CI
-
-on: [push]
+name: build
+on: ['push']
 
 jobs:
-  build:
-
+  Test:
+    name: "🔨 Test code"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8', '11.0.5' ]
+        jdk: [ '8', '17' ]
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: ${{ matrix.java }}
-        architecture: x64
-    - name: Build with Gradle
-      run: ./gradlew build
+      - name: Setup Java ${{ matrix.jdk }} JDK
+        uses: actions/setup-java@v3.2.0
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.jdk }}
+
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Validate Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Setup and Run Gradle
+        run: ./gradlew test
+        env:
+          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          MAVEN_NAME: ${{ secrets.MAVEN_NAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+
+  Publish:
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - Test
+    name: "📄 Publish to maven repo"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3.2.0
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Validate Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Setup and Run Gradle
+        run: ./gradlew publishAllPublicationsToReleasesRepository
+        env:
+          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          MAVEN_NAME: ${{ secrets.MAVEN_NAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,16 @@
 plugins {
     id "java"
     id "java-library"
-    id "io.freefair.lombok" version "6.5.0.2"
+    id "io.freefair.lombok" version "6.5.0.3"
     id "maven-publish"
 }
 
 group 'com.cadiducho'
-version '1.4.3'
+version '1.5'
+
+java {
+    withJavadocJar()
+}
 
 publishing {
     publications {
@@ -18,6 +22,27 @@ publishing {
             from components.java
         }
     }
+    repositories {
+        maven {
+            name = "cadiduchoRepoSnapshots"
+            url = "https://repo.cadiducho.com/snapshots"
+            credentials(PasswordCredentials)
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+        maven {
+            name = "releases"
+            url = "https://repo.cadiducho.com/releases"
+            credentials {
+                username System.getenv("MAVEN_NAME")
+                password System.getenv("MAVEN_PASSWORD")
+            }
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+    }
 }
 
 javadoc {
@@ -30,19 +55,19 @@ repositories {
     mavenCentral()
     mavenLocal()
     maven {
-        url "https://cadiducho.com/repo/"
+        url "https://repo.cadiducho.com/releases"
     }
 }
 
 dependencies {
-    api group: 'com.cadiducho', name: 'TelegramBotAPI', version: '5.3'
+    api group: 'com.cadiducho', name: 'TelegramBotAPI', version: '6.2'
 
     //Tests
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.0'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.0'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.7.0'
 }
 
 test {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/cadiducho/zincite/DefaultZinciteExceptionHandler.java b/src/main/java/com/cadiducho/zincite/DefaultZinciteExceptionHandler.java
@@ -43,7 +43,7 @@ public void handle(TelegramException exception) {
      */
     private void send(String msg) {
         try {
-            bot.sendMessage(ownerId, msg, ParseMode.HTML, null, null, null, null);
+            bot.sendMessage(ownerId, msg, ParseMode.HTML, null, null, null, null, null);
         } catch (TelegramException ignored) { }
     }
 }