From 8581a1bfff9c0a0ebf6ad00e0b574836374572c8 Mon Sep 17 00:00:00 2001 From: "Dr.Blank" <64108942+Dr-Blank@users.noreply.github.com> Date: Sun, 8 Dec 2024 01:03:23 +0530 Subject: [PATCH] make shelfsdk a submodule --- .github/workflows/flutter_release.yaml | 8 ++------ .github/workflows/flutter_test.yaml | 9 +++------ .gitignore | 3 --- .gitmodules | 3 +++ pubspec.lock | 2 +- pubspec.yaml | 1 + 6 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 .gitmodules diff --git a/.github/workflows/flutter_release.yaml b/.github/workflows/flutter_release.yaml index e5544be..7a5d1ba 100644 --- a/.github/workflows/flutter_release.yaml +++ b/.github/workflows/flutter_release.yaml @@ -16,13 +16,9 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 - - - name: Checkout shelfsdk - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - repository: Dr-Blank/shelfsdk - path: ./shelfsdk + submodules: 'true' - name: Set Up Java uses: actions/setup-java@v3.12.0 diff --git a/.github/workflows/flutter_test.yaml b/.github/workflows/flutter_test.yaml index 9c74813..301598b 100644 --- a/.github/workflows/flutter_test.yaml +++ b/.github/workflows/flutter_test.yaml @@ -12,7 +12,9 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + submodules: 'true' - name: Decode android/upload.jks run: echo "${{ secrets.UPLOAD_KEYSTORE_JKS }}" | base64 --decode > android/upload.jks @@ -20,11 +22,6 @@ jobs: - name: Decode android/key.properties run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties - - name: Checkout shelfsdk - uses: actions/checkout@v3 - with: - repository: Dr-Blank/shelfsdk - path: ./shelfsdk - name: Set up Flutter uses: subosito/flutter-action@v2 diff --git a/.gitignore b/.gitignore index c137f7a..29a3a50 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,3 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release - -# separate git repo for api sdk -/shelfsdk \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..557497e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "shelfsdk"] + path = shelfsdk + url = https://github.com/Dr-Blank/shelfsdk diff --git a/pubspec.lock b/pubspec.lock index a6ff204..6f2b262 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1565,4 +1565,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + flutter: ">=3.24.5" diff --git a/pubspec.yaml b/pubspec.yaml index 9a38a3e..5584a86 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,6 +20,7 @@ version: 0.0.15+6 environment: sdk: ">=3.3.4 <4.0.0" + flutter: ">=3.24.5 <4.0.0" isar_version: &isar_version ^4.0.0-dev.13 # define the version to be used