From 98e350a8aa76a58f402cd5b392ea4bed3b8f16f0 Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 19:28:16 +0530 Subject: [PATCH 1/6] Mock api key for easel --- easel/lib/env.dart | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easel/lib/env.dart diff --git a/easel/lib/env.dart b/easel/lib/env.dart new file mode 100644 index 0000000000..17fbc07842 --- /dev/null +++ b/easel/lib/env.dart @@ -0,0 +1,2 @@ +const apiKey = "mock_api_key"; +const xApiKey = "mock_x_api_key"; From 02e65ee9c182312a227148c6cdf6f313acf65f24 Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 19:34:57 +0530 Subject: [PATCH 2/6] Mock api key for easel --- easel/lib/env.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easel/lib/env.dart b/easel/lib/env.dart index 17fbc07842..abf631d8be 100644 --- a/easel/lib/env.dart +++ b/easel/lib/env.dart @@ -1,2 +1,2 @@ -const apiKey = "mock_api_key"; + const xApiKey = "mock_x_api_key"; From af5332451d125227c0da26176c912c410a3d2106 Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 19:51:07 +0530 Subject: [PATCH 3/6] updated build.gradle to solve java version error --- easel/android/app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easel/android/app/build.gradle b/easel/android/app/build.gradle index cd8c6a63cd..b5826d359c 100644 --- a/easel/android/app/build.gradle +++ b/easel/android/app/build.gradle @@ -83,5 +83,9 @@ 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' } From 475432602f336cb495fb0cdaf7ade9b761759167 Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 20:14:28 +0530 Subject: [PATCH 4/6] updated flutter.yml to solve java version error in easel --- .github/workflows/flutter.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index 73654adedc..93578c323a 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -15,6 +15,10 @@ 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' @@ -26,8 +30,6 @@ jobs: ./borg.sh boot flutter analyze flutter test - - easel: name: easel @@ -39,6 +41,10 @@ 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' @@ -54,7 +60,6 @@ jobs: flutter build appbundle --debug flutter test - dart_sdk: name: SDK runs-on: ubuntu-latest @@ -65,6 +70,10 @@ 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' From eb5df4b55131a2d6dd1d6bf32e8d7dde7fc5c38b Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 20:22:21 +0530 Subject: [PATCH 5/6] updated build.gradle to solve java version error in easel --- easel/android/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easel/android/app/build.gradle b/easel/android/app/build.gradle index b5826d359c..c16c6c805e 100644 --- a/easel/android/app/build.gradle +++ b/easel/android/app/build.gradle @@ -31,12 +31,12 @@ android { compileSdkVersion 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { From f9cbefd04d6a017ed7e07747a5571d393c647c07 Mon Sep 17 00:00:00 2001 From: raviramnani Date: Tue, 6 Aug 2024 20:46:39 +0530 Subject: [PATCH 6/6] undo changes --- .github/workflows/flutter.yml | 15 +++------------ easel/android/app/build.gradle | 10 +++------- 2 files changed, 6 insertions(+), 19 deletions(-) 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' }