From 548b24b4157f63ceb171debf3ae5a62aa84d321f Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 17 May 2024 02:41:10 +0200 Subject: [PATCH] CI: Fixing issues on CI caused by wrong JDK version --- .github/workflows/build.yml | 6 +++--- android/app/build.gradle | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bf58bf..8f5cae0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Flutter MultiPlatform Build -on: [ push, pull_request, workflow_dispatch ] +on: [ pull_request, workflow_dispatch ] jobs: build: @@ -8,7 +8,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 @@ -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 index 13f0aa8..6e3bccb 100644 --- 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