Merge pull request #392 from tidev/updateDeps

update dependencies
tidev · Oct 7, 2022 · c89ece1 · c89ece1
2 parents 53e3f71 + 76879ec
commit c89ece1
Show file tree

Hide file tree

Showing 8 changed files with 10,633 additions and 14,748 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,5 +1,5 @@
 name: Android Build
-on: 
+on:
   push:
     paths-ignore:
     - 'ios/**'
@@ -17,15 +17,20 @@ jobs:
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       USE_CCACHE: 1
-      SDK_VERSION: 9.3.2.GA
+      SDK_VERSION: 11.0.0.GA
       MODULE_ID: ti.barcode
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 14.x
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
+
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'adopt'
+        java-version: '11'
 
     - name: Cache Node.js modules
       id: node-cache

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 14.x
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
 
     - run: npm ci
       name: Install dependencies

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -1,5 +1,5 @@
 name: iOS Build
-on: 
+on:
   push:
     paths-ignore:
     - 'android/**'
@@ -9,21 +9,21 @@ on:
     - 'android/**'
     - 'apidoc/**'
   workflow_dispatch:
-  
+
 jobs:
   ios:
     runs-on: macos-latest
     name: iOS
     env:
-      SDK_VERSION: 9.3.2.GA
+      SDK_VERSION: 11.0.0.GA
       MODULE_ID: ti.barcode
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 14.x
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
 
     - name: Cache Node.js modules
       id: node-cache

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -1,5 +1,5 @@
 name: JavaScript Lint
-on: 
+on:
   push:
     paths:
     - '**.js'
@@ -11,18 +11,18 @@ on:
     - '**.json'
     - '**.eslint*'
   workflow_dispatch:
-  
+
 jobs:
   js:
     runs-on: ubuntu-latest
     name: JavaScript
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 14.x
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
 
     - name: Cache Node.js modules
       id: node-cache

diff --git a/ios/Classes/TiBarcodeModule.m b/ios/Classes/TiBarcodeModule.m
@@ -55,7 +55,7 @@ - (id)_initWithPageContext:(id<TiEvaluator>)context
 
 - (NSNumber *)canShow:(id)unused
 {
-  //TO DO: Remove
+  // TO DO: Remove
   return NUMBOOL(YES);
 }
 
@@ -561,7 +561,7 @@ - (void)cancelled
 MAKE_SYSTEM_PROP(FORMAT_RSS_EXPANDED, kBarcodeFormatRSSExpanded);
 MAKE_SYSTEM_PROP(FORMAT_UPC_A, kBarcodeFormatUPCA);
 MAKE_SYSTEM_PROP(FORMAT_UPC_E, kBarcodeFormatUPCE);
-//MAKE_SYSTEM_PROP(FORMAT_UPCEAN_EXTENSION, kBarcodeFormatUPCEANExtension); // extension, not a stand-alone
+// MAKE_SYSTEM_PROP(FORMAT_UPCEAN_EXTENSION, kBarcodeFormatUPCEANExtension); // extension, not a stand-alone
 
 MAKE_SYSTEM_PROP(UNKNOWN, 0);
 MAKE_SYSTEM_PROP(URL, 1);