Add 6.0 to artifact creation version

And set the default version to 6.0.
This task is part of flutter-tizen/flutter-tizen#526

Author: JSUYA

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        api-version: [5.5, 6.5]
+        api-version: [5.5, 6, 6.5]
         arch: [arm, arm64, x86]
         include:
           - arch: arm
@@ -42,6 +42,14 @@ jobs:
         run: |
           gclient config --name=src --unmanaged https://github.com/${{ github.repository }}
           gclient sync -v --no-history --shallow
+          
+      - name: Generate Tizen 5.5 sysroot
+        if: ${{ matrix.api-version == 5.5 }}
+        run: src/tools/generate_sysroot.py --api-version 5.5 --out src/sysroot-5.5
+
+      - name: Generate Tizen 6.0 sysroot
+        if: ${{ matrix.api-version == 6 }}
+        run: src/tools/generate_sysroot.py --api-version 6.0 --out src/sysroot-6.0
 
       - name: Generate Tizen 6.5 sysroot
         if: ${{ matrix.api-version == 6.5 }}
@@ -53,6 +61,19 @@ jobs:
           src/tools/gn \
             --target-cpu ${{ matrix.arch }} \
             --target-toolchain /usr/lib/llvm-12 \
+            --target-sysroot src/sysroot-5.5/${{ matrix.arch }} \
+            --api-version 5.5 \
+            --target-dir build
+          ninja -C src/out/build
+
+      - name: Build for Tizen 6.0
+        if: ${{ matrix.api-version == 6 }}
+        run: |
+          src/tools/gn \
+            --target-cpu ${{ matrix.arch }} \
+            --target-toolchain /usr/lib/llvm-12 \
+            --target-sysroot src/sysroot-6.0/${{ matrix.arch }} \
+            --system-cxx \
             --target-dir build
           ninja -C src/out/build
 
@@ -87,7 +108,7 @@ jobs:
           if-no-files-found: error
 
       - uses: actions/upload-artifact@v4
-        if: ${{ matrix.arch == 'arm' && matrix.api-version == 5.5 }}
+        if: ${{ matrix.arch == 'arm' && matrix.api-version == 6 }}
         with:
           name: tizen-common
           path: |
@@ -115,7 +136,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: tizen-5.5-arm_unittests
+          name: tizen-6-arm_unittests
 
       - name: Download engine
         run: |

README.md

@@ -58,7 +58,7 @@ The Flutter embedder for Tizen.
 ### Notes
 
 - To build an app (TPK) with the embedder generated in the above, copy the output artifacts (`libflutter_tizen*.so`) into the [flutter-tizen](https://github.com/flutter-tizen/flutter-tizen) tool's cached artifacts directory (`flutter/bin/cache/artifacts/engine`) and run `flutter-tizen run` or `flutter-tizen build tpk`.
-- To use the target device's `libstdc++.so` instead of the embedder's built-in libc++ (`third_party/libcxx`), provide the `--system-cxx` option to `tools/gn`. Tizen 5.5's `libstdc++.so` is not compatible with C++17 so you must use a sysroot for Tizen 6.0 or above.
+- To use the target device's `libstdc++.so` instead of the embedder's built-in libc++ (`third_party/libcxx`), provide the `--system-cxx` option to `tools/gn`. If Tizen version is 6.0 or above, you must use a sysroot.
 - Building NUI-related code requires a sysroot for Tizen 6.5 or above and the `--api-version 6.5` option.
 
 ## Repository structure

tools/generate_sysroot.py

@@ -218,8 +218,8 @@ def main():
                       help='Force re-downloading of packages')
   parser.add_argument('-q', '--quiet', action='store_true',
                       help='Suppress log output')
-  parser.add_argument('--api-version', metavar='VER', default=5.5, type=float,
-                      help='Target API version (defaults to 5.5)')
+  parser.add_argument('--api-version', metavar='VER', default=6.0, type=float,
+                      help='Target API version (defaults to 6.0)')
   args = parser.parse_args()
 
   if args.out:

tools/gn

@@ -100,7 +100,7 @@ def parse_args(args):
   parser.add_argument('--target-toolchain', type=str, required=True)
   parser.add_argument('--target-sysroot', type=str)
 
-  parser.add_argument('--api-version', default='5.5', type=str)
+  parser.add_argument('--api-version', default='6.0', type=str)
   parser.add_argument('--system-cxx', default=False, action='store_true')
 
   parser.add_argument('--target-dir', type=str)