Skip to content

Commit 525ea76

Browse files
ereioereio
authored
Merge pull request #576 from syphon-org/dev
[release] v0.2.9
2 parents 134a5bd + 7f866f6 commit 525ea76

File tree

252 files changed

+3940
-2010
lines changed

Some content is hidden

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

252 files changed

+3940
-2010
lines changed

‎.drone.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ trigger:
99
- push
1010
steps:
1111
- name: build android
12-
image: cirrusci/flutter:2.8.0
12+
image: cirrusci/flutter:2.8.1
1313
commands:
1414
# Keep track of the time when build was started
1515
- echo $(date -Iseconds) > BUILD_START_TIME
@@ -61,7 +61,7 @@ trigger:
6161
- push
6262
steps:
6363
- name: build android
64-
image: cirrusci/flutter:2.8.0
64+
image: cirrusci/flutter:2.8.1
6565
commands:
6666
# Keep track of the time when build was started
6767
- echo $(date -Iseconds) > BUILD_START_TIME
@@ -115,7 +115,7 @@ trigger:
115115
- push
116116
steps:
117117
- name: build linux
118-
image: cirrusci/flutter:2.8.0
118+
image: cirrusci/flutter:2.8.1
119119
commands:
120120
# Install dependencies
121121
- apt-get update -y
@@ -128,9 +128,9 @@ steps:
128128
- flutter config --enable-linux-desktop
129129
# Build the linux app exec
130130
- flutter build linux --release
131-
- cp -a /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
132-
- cp -a /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
133-
- cp -a /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
131+
- cp -aL /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
132+
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
133+
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
134134
- tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/x64/release/bundle .
135135

136136
- name: release linux
@@ -159,7 +159,7 @@ steps:
159159
# - push
160160
#steps:
161161
# - name: build linux
162-
# image: cirrusci/flutter:2.8.0
162+
# image: cirrusci/flutter:2.8.1
163163
# commands:
164164
# # Install dependencies
165165
# - apt-get update -y
@@ -172,9 +172,9 @@ steps:
172172
# - flutter config --enable-linux-desktop
173173
# # Build the linux app exec
174174
# - flutter build linux --release
175-
# - cp -a /usr/lib/aarch64-linux-gnu/libjsoncpp.so* build/linux/arm64/release/bundle/lib/
176-
# - cp -a /usr/lib/aarch64-linux-gnu/libsqlite3.so build/linux/arm64/release/bundle/lib/
177-
# - cp -a /usr/lib/aarch64-linux-gnu/libsqlcipher.so build/linux/arm64/release/bundle/lib/
175+
# - cp -aL /usr/lib/aarch64-linux-gnu/libjsoncpp.so* build/linux/arm64/release/bundle/lib/
176+
# - cp -aL /usr/lib/aarch64-linux-gnu/libsqlite3.so build/linux/arm64/release/bundle/lib/
177+
# - cp -aL /usr/lib/aarch64-linux-gnu/libsqlcipher.so build/linux/arm64/release/bundle/lib/
178178
# - tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/arm64/release/bundle .
179179

180180
# - name: release linux
@@ -204,7 +204,7 @@ trigger:
204204
- push
205205
steps:
206206
- name: build linux
207-
image: cirrusci/flutter:2.8.0
207+
image: cirrusci/flutter:2.8.1
208208
commands:
209209
# Install dependencies
210210
- apt-get update -y
@@ -217,9 +217,9 @@ steps:
217217
- flutter config --enable-linux-desktop
218218
# Build the linux app exec
219219
- flutter build linux --release
220-
- cp -a /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
221-
- cp -a /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
222-
- cp -a /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
220+
- cp -aL /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
221+
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
222+
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
223223
- tar -cvzf syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).linux.x64.tar.gz -C build/linux/x64/release/bundle .
224224

225225
- name: release linux

‎.fvm/fvm_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"flutterSdkVersion": "2.8.0",
2+
"flutterSdkVersion": "2.8.1",
33
"flavors": {}
44
}

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,23 @@
1212
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1313

1414
<application
15-
android:name="io.flutter.app.FlutterApplication"
15+
android:name="${applicationName}"
1616
android:label="Syphon"
1717
android:allowBackup="false"
1818
android:icon="@mipmap/ic_launcher">
1919
<service
20-
android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
20+
android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
2121
android:permission="android.permission.BIND_JOB_SERVICE"
2222
android:exported="false"/>
2323
<receiver
24-
android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
24+
android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
2525
android:exported="false"/>
2626
<receiver
27-
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
28-
android:enabled="false">
27+
android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
28+
android:enabled="false"
29+
android:exported="false">
2930
<intent-filter>
30-
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
31+
<action android:name="android.intent.action.BOOT_COMPLETED" />
3132
</intent-filter>
3233
</receiver>
3334
<activity

‎android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
8383
try {
8484
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
8585
} catch(Exception e) {
86-
Log.e(TAG, "Error registering plugin path_provider, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
86+
Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
87+
}
88+
try {
89+
flutterEngine.getPlugins().add(new com.baseflow.permissionhandler.PermissionHandlerPlugin());
90+
} catch(Exception e) {
91+
Log.e(TAG, "Error registering plugin permission_handler, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
8792
}
8893
try {
8994
flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.0.1'
9+
classpath 'com.android.tools.build:gradle:4.2.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎android/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2-
android.enableR8=true
32
android.useAndroidX=true
43
android.enableJetifier=true

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
77
org.gradle.java.home=/Library/Java/JavaVirtualMachines/openjdk-14.0.1.jdk/Contents/Home
8-
distributionSha256Sum=3fd824892df8ad5847be6e4fb7d3600068437de172939fd657cc280a1a629f63
8+
distributionSha256Sum=b13f5d97f08000996bf12d9dd70af3f2c6b694c2c663ab1b545e9695562ad1ee

‎assets/app_logo.svg‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)