Skip to content

Commit 5aa7b3f

Browse files
authored
Merge pull request #1198 from numbersprotocol/develop
Bump version to 0.47.0
2 parents 8306805 + 82b33cd commit 5aa7b3f

File tree

66 files changed

+2656
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2656
-36
lines changed

.github/workflows/build.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,32 @@ jobs:
128128
run: |
129129
npx cap sync ios
130130
xcodebuild archive -workspace ios/App/App.xcworkspace -scheme App -sdk iphoneos -configuration Debug -archivePath build/App.xcarchive -showBuildTimingSummary -allowProvisioningUpdates archive
131+
132+
notification-success:
133+
runs-on: ubuntu-latest
134+
needs: test
135+
136+
steps:
137+
- uses: actions/checkout@v2
138+
139+
- name: Slack Notification
140+
uses: rtCamp/action-slack-notify@v2
141+
if: ${{ github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop'}}
142+
env:
143+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
144+
SLACK_COLOR: 'success'
145+
146+
notification-failure:
147+
runs-on: ubuntu-latest
148+
needs: test
149+
if: ${{ failure() }}
150+
151+
steps:
152+
- uses: actions/checkout@v2
153+
154+
- name: Slack Notification
155+
uses: rtCamp/action-slack-notify@v2
156+
if: ${{ github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop'}}
157+
env:
158+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
159+
SLACK_COLOR: 'failure'

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.47.0
9+
10+
### Added
11+
12+
- Add GoPro support (hidden by default)
13+
14+
###
15+
816
## 0.46.0
917

1018
### Added

android/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "io.numbersprotocol.capturelite"
77
minSdkVersion rootProject.ext.minSdkVersion
88
targetSdkVersion rootProject.ext.targetSdkVersion
9-
versionCode 290
10-
versionName "0.46.0"
9+
versionCode 300
10+
versionName "0.47.0"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {

android/app/capacitor.build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ android {
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
12+
implementation project(':capacitor-community-bluetooth-le')
13+
implementation project(':capacitor-community-http')
14+
implementation project(':capacitor-community-wifi')
1215
implementation project(':capacitor-blob-writer')
1316

1417
}

android/app/google-services.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
{
3131
"client_id": "549594343019-2nnhn1apr7n1ie8l2tbbuhpelp5mul9v.apps.googleusercontent.com",
3232
"client_type": 3
33+
},
34+
{
35+
"client_id": "549594343019-2nnhn1apr7n1ie8l2tbbuhpelp5mul9v.apps.googleusercontent.com",
36+
"client_type": 2,
37+
"ios_info": {
38+
"bundle_id": "io.numbersprotocol.capturelite"
39+
}
3340
}
3441
]
3542
}

android/app/src/main/AndroidManifest.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,30 @@
2121
<!-- Audio -->
2222
<uses-permission android:name="android.permission.RECORD_AUDIO" />
2323
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
24+
<!-- Wi-Fi -->
25+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
26+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
27+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
28+
<!-- Bluetooth -->
29+
<!-- Request legacy Bluetooth permissions on older devices. -->
30+
<uses-permission
31+
android:name="android.permission.BLUETOOTH"
32+
android:maxSdkVersion="30" />
33+
<uses-permission
34+
android:name="android.permission.BLUETOOTH_ADMIN"
35+
android:maxSdkVersion="30" />
36+
<!-- Needed only if your app looks for Bluetooth devices.
37+
You must add an attribute to this permission, or declare the
38+
ACCESS_FINE_LOCATION permission, depending on the results when you
39+
check location usage in your app. -->
40+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
41+
<!-- Needed only if your app makes the device discoverable to Bluetooth
42+
devices. -->
43+
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
44+
<!-- Needed only if your app communicates with already-paired Bluetooth
45+
devices. -->
46+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
47+
2448

2549
<queries>
2650
<intent>

android/app/src/main/java/io/numbersprotocol/capturelite/MainActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import com.getcapacitor.Plugin;
77

88
import com.equimaps.capacitorblobwriter.BlobWriter;
9+
import com.capacitorjs.community.plugins.bluetoothle.BluetoothLe;
10+
import com.digaus.capacitor.wifi.Wifi;
11+
import com.getcapacitor.plugin.http.Http;
912

1013
import java.util.ArrayList;
1114
import android.content.res.Configuration;
@@ -47,6 +50,9 @@ public void onCreate(Bundle savedInstanceState) {
4750
this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
4851
// Additional plugins you've installed go here
4952
add(BlobWriter.class);
53+
add(BluetoothLe.class);
54+
add(Wifi.class);
55+
add(Http.class);
5056
}});
5157
}
5258
}

android/app/src/main/res/xml/network_security_config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<network-security-config>
33
<domain-config cleartextTrafficPermitted="true">
44
<domain includeSubdomains="false">localhost</domain>
5+
<domain includeSubdomains="true">10.5.5.9</domain>
56
</domain-config>
67
</network-security-config>

0 commit comments

Comments
 (0)