CI: Fixing issues on CI caused by wrong JDK version

0Nom4D · May 19, 2024 · 548b24b · 548b24b
1 parent 4eeb169
commit 548b24b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,14 +1,14 @@
 name: Flutter MultiPlatform Build
 
-on: [ push, pull_request, workflow_dispatch ]
+on: [ pull_request, workflow_dispatch ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Flutter Install
-        uses: subosito/flutter-action@v2.10.0
+        uses: subosito/flutter-action@v2.16.0
         with:
           channel: 'stable'
           architecture: x64
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Flutter Install
-        uses: subosito/flutter-action@v2.10.0
+        uses: subosito/flutter-action@v2.16.0
         with:
           channel: 'stable'
           architecture: x64

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,20 +32,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dock.guardian.guardian_dock"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName