diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index 93578c323a..af33aa86da 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -15,10 +15,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '11' - uses: subosito/flutter-action@v2 with: channel: "stable" # or: 'beta', 'dev' or 'master' @@ -30,6 +26,8 @@ jobs: ./borg.sh boot flutter analyze flutter test + + easel: name: easel @@ -41,10 +39,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '11' - uses: subosito/flutter-action@v2 with: channel: "stable" # or: 'beta', 'dev' or 'master' @@ -60,6 +54,7 @@ jobs: flutter build appbundle --debug flutter test + dart_sdk: name: SDK runs-on: ubuntu-latest @@ -70,10 +65,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '11' - uses: subosito/flutter-action@v2 with: channel: "stable" # or: 'beta', 'dev' or 'master' diff --git a/easel/android/app/build.gradle b/easel/android/app/build.gradle index c16c6c805e..cd8c6a63cd 100644 --- a/easel/android/app/build.gradle +++ b/easel/android/app/build.gradle @@ -31,12 +31,12 @@ android { compileSdkVersion 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '17' + jvmTarget = '1.8' } sourceSets { @@ -83,9 +83,5 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.5.0' - implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.multidex:multidex:2.0.1' }