upgrade gradle and AGP

.github/workflows/android.yml

@@ -1,6 +1,7 @@
 name: Android CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ main ]
   pull_request:

.github/workflows/mattermost-ziti-webhook.yml

@@ -1,27 +1,35 @@
-name: mattermost-ziti-webhook
+name: ziti-mattermost-webhook
 on:
-  create:
-  delete:
   issues:
   issue_comment:
   pull_request_review:
+    types: [submitted]
   pull_request_review_comment:
   pull_request:
+    types: [opened, reopened]
   push:
   fork:
   release:
+    types: [released]
 
 jobs:
-  mattermost-ziti-webhook:
+  ziti-webhook:
     runs-on: ubuntu-latest
-    name: POST Webhook
-    if: github.repository_owner == 'openziti' && github.actor != 'dependabot[bot]'
-    env:
-      ZITI_LOG: 99
-      ZITI_NODEJS_LOG: 99
+    name: Ziti Mattermost Webhook
     steps:
-      - uses: openziti/ziti-webhook-action@main
-        with:
-          ziti-id: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
-          webhook-url: ${{ secrets.ZITI_MATTERMOST_WEBHOOK_URL }}
-          webhook-secret: ${{ secrets.ZITI_MATTERMOSTI_WEBHOOK_SECRET }}
+    - uses: openziti/ziti-mattermost-action-py@main
+      if: github.event_name != 'pull_request_review'
+      with:
+        zitiId: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
+        webhookUrl: ${{ secrets.ZHOOK_URL }}
+        eventJson: ${{ toJson(github.event) }}
+        senderUsername: "GitHubZ"
+        destChannel: "dev-notifications"
+    - uses: openziti/ziti-mattermost-action-py@main
+      if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
+      with:
+        zitiId: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
+        webhookUrl: ${{ secrets.ZHOOK_URL }}
+        eventJson: ${{ toJson(github.event) }}
+        senderUsername: "GitHubZ"
+        destChannel: "dev-notifications"

app/build.gradle

@@ -23,13 +23,13 @@ android {
             storePassword System.getenv('RELEASE_KEYSTORE_PASSWORD')
         }
     }
-    compileSdkVersion 31
+    compileSdk = 33
     ndkVersion "22.1.7171670"
 
     defaultConfig {
         applicationId "org.openziti.mobile"
         minSdkVersion 26
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode vc
         versionName "${project.version}"
 

build.gradle

@@ -7,7 +7,7 @@
 buildscript {
     ext {
         versions = [
-                kotlin: '1.6.10',
+                kotlin: '1.6.21',
                 coroutines: '1.6.0',
                 androidxLifecycle: '2.4.0',
                 ziti: '0.23.11'
@@ -20,7 +20,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

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