Merge pull request #978 from don/androidx-deps

Android: Add androidx.annotation reference for RequiresPermission attribute
don · Aug 13, 2023 · aaa158e · aaa158e
2 parents 086e75f + b4c7e7a
commit aaa158e
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 50 deletions.
diff --git a/.github/workflows/capacitor.yaml b/.github/workflows/capacitor.yaml
@@ -3,16 +3,16 @@ name: Capacitor
 on:
   workflow_dispatch:
   push:
-    branches: [ "master" ]
+    branches: ['master']
   pull_request:
-    branches: [ "master" ]
+    branches: ['master']
 
 jobs:
   capacitor-android:
     name: android@${{ matrix.capacitor }}
-    
+
     runs-on: ubuntu-latest
-    
+
     strategy:
       matrix:
         include:
@@ -24,60 +24,59 @@ jobs:
             node: 14.x
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK ${{ matrix.jdk }}
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.jdk }}
-        distribution: 'temurin'
-    - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node }}
-    - name: Build test app
-      run: |
-        mkdir temp
-        cd temp
-        mkdir www
-        touch www/index.html
-        npm init -y
-        npm install ..
-        npm install @capacitor/cli@${{ matrix.capacitor }} @capacitor/core@${{ matrix.capacitor }} @capacitor/android@${{ matrix.capacitor }}
-        npx cap init test io.test.app
-        npx cap add android
-        npx cap sync android
-        cd android
-        chmod +x gradlew
-        ./gradlew build
-        
+      - uses: actions/checkout@v3
+      - name: set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: 'temurin'
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Build test app
+        run: |
+          mkdir temp
+          cd temp
+          mkdir www
+          touch www/index.html
+          npm init -y
+          npm install ..
+          npm install @capacitor/cli@${{ matrix.capacitor }} @capacitor/core@${{ matrix.capacitor }} @capacitor/android@${{ matrix.capacitor }}
+          npx cap init test io.test.app
+          npx cap add android
+          npx cap sync android
+          cd android
+          chmod +x gradlew
+          ./gradlew build
 
   capacitor-ios:
     name: ios@${{ matrix.capacitor }}
     runs-on: macos-latest
-    
+
     strategy:
       matrix:
         include:
           - capacitor: latest
             node: 18.x
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node }}
-    - name: Build test app
-      run: |
-        mkdir temp
-        cd temp
-        mkdir www
-        touch www/index.html
-        npm init -y
-        npm install ..
-        npm install @capacitor/cli@${{ matrix.capacitor }} @capacitor/core@${{ matrix.capacitor }} @capacitor/ios@${{ matrix.capacitor }}
-        npx cap init test io.test.app
-        npx cap add ios
-        npx cap sync ios
-        cd ios
-        xcodebuild -workspace App/App.xcworkspace -scheme CapacitorCordova -configuration Debug -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 14 Pro Max"
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Build test app
+        run: |
+          mkdir temp
+          cd temp
+          mkdir www
+          touch www/index.html
+          npm init -y
+          npm install ..
+          npm install @capacitor/cli@${{ matrix.capacitor }} @capacitor/core@${{ matrix.capacitor }} @capacitor/ios@${{ matrix.capacitor }}
+          npx cap init test io.test.app
+          npx cap add ios
+          npx cap sync ios
+          cd ios
+          xcodebuild -workspace App/App.xcworkspace -scheme CapacitorCordova -configuration Debug -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 14 Pro Max"
diff --git a/.prettierrc b/.prettierrc
@@ -15,6 +15,12 @@
             "options": {
                 "tabWidth": 2
             }
+        },
+        {
+            "files": "*.yaml",
+            "options": {
+                "tabWidth": 2
+            }
         }
     ]
 }
diff --git a/plugin.xml b/plugin.xml
@@ -83,6 +83,7 @@
         <source-file src="src/android/Helper.java" target-dir="src/com/megster/cordova/ble/central"/>
         <source-file src="src/android/UUIDHelper.java" target-dir="src/com/megster/cordova/ble/central"/>
         <source-file src="src/android/L2CAPContext.java" target-dir="src/com/megster/cordova/ble/central"/>
+        <framework src="androidx.annotation:annotation:*"/>
     </platform>
 
     <platform name="browser">