Kotlin 1.8.x

Merge pull request #198 from DerTyp7214/rComp-Kotlin-1.8
DerTyp7214 · Dec 19, 2022 · 8b4961e · 8b4961e
2 parents 924450a + 4f23a01
commit 8b4961e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 30 deletions.
diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
 
@@ -29,7 +29,7 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.8.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: temurin
           java-version: 17
@@ -144,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
 
@@ -157,7 +157,7 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.8.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: temurin
           java-version: 17
@@ -274,7 +274,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
 
@@ -287,7 +287,7 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.8.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: temurin
           java-version: 17

diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
 
@@ -22,7 +22,7 @@ jobs:
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/cache@v3.0.11
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: temurin
           java-version: 17
@@ -72,15 +72,14 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: r0adkll/sign-android-release@v1
+        uses: ilharp/sign-android-release@v1.0.4
         with:
-          releaseDirectory: app/build/outputs/apk/pro
-          alias: ${{ secrets.KEYALIAS }}
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          releaseDir: app/build/outputs/apk/debug
+          keyAlias: ${{ secrets.KEYALIAS }}
+          signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: "33.0.0"
+          buildToolsVersion: 33.0.1
 
       - name: List files
         run: ls app/build/outputs/apk/pro

diff --git a/.github/workflows/createPullRequest.yml b/.github/workflows/createPullRequest.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
           fetch-depth: 0
@@ -21,7 +21,7 @@ jobs:
           mkdir -p .tmp
           curl -LsS https://raw.githubusercontent.com/DerTyp7214/DerTyp7214/main/PULL_REQUEST_TEMPLATE.md -o .tmp/PULL_REQUEST_TEMPLATE.md
       - name: Create Pull Request
-        uses: devops-infra/action-pull-request@v0.5.1
+        uses: devops-infra/action-pull-request@v0.5.3
         with:
           github_token: ${{ secrets.REPO_SCOPED_TOKEN }}
           template: .tmp/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
         with:
           submodules: recursive
 
-      - uses: nttld/setup-ndk@v1
+      - uses: nttld/setup-ndk@v1.2.0
         with:
           ndk-version: r25b
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.6.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: temurin
           java-version: 17

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 plugins {
     id("com.android.application")
     id("com.google.gms.google-services")
-    id("kotlin-android-extensions")
     kotlin("android")
     kotlin("kapt")
 }
@@ -52,11 +51,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_15
-        targetCompatibility = JavaVersion.VERSION_15
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_15.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     packagingOptions {
@@ -79,7 +78,7 @@ dependencies {
 
     implementation("com.github.DerTyp7214:PreferencesPlus:1.0")
 
-    implementation("com.google.protobuf:protobuf-kotlin:3.21.11")
+    implementation("com.google.protobuf:protobuf-kotlin:3.21.12")
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.6.0-alpha04")
@@ -92,7 +91,7 @@ dependencies {
     implementation("dev.chrisbanes.insetter:insetter:0.6.1")
     implementation("androidx.core:core-ktx:1.9.0")
     //noinspection DifferentStdlibGradleVersion
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0-RC")
     implementation("androidx.core:core:1.9.0")
     implementation("com.google.android.material:material:1.8.0-beta01")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha05")
@@ -105,7 +104,7 @@ dependencies {
     implementation("com.google.code.gson:gson:2.10")
     implementation("com.bignerdranch.android:simple-item-decoration:1.0.0")
     implementation("de.dertyp7214:PRDownloader:v0.6.0")
-    implementation("com.github.skydoves:balloon:1.4.8-SNAPSHOT")
+    implementation("com.github.skydoves:balloon:1.4.9-SNAPSHOT")
     implementation("androidx.appcompat:appcompat:1.7.0-alpha01")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.4")
@@ -117,5 +116,5 @@ dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
     debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha03")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.22")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0-RC")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:8.0.0-alpha09")
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "1.7.22"))
+        classpath(kotlin("gradle-plugin", version = "1.8.0-RC"))
         classpath("com.google.gms:google-services:4.3.14")
         //classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.1")
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 28 17:49:00 CEST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.1-20221213231056+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.1-20221218232138+0000-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists