Skip to content

Commit

Permalink
Merge pull request #576 from syphon-org/dev
Browse files Browse the repository at this point in the history
[release] v0.2.9
  • Loading branch information
ereio authored Feb 23, 2022
2 parents 134a5bd + 7f866f6 commit 525ea76
Show file tree
Hide file tree
Showing 252 changed files with 3,940 additions and 2,010 deletions.
28 changes: 14 additions & 14 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trigger:
- push
steps:
- name: build android
image: cirrusci/flutter:2.8.0
image: cirrusci/flutter:2.8.1
commands:
# Keep track of the time when build was started
- echo $(date -Iseconds) > BUILD_START_TIME
Expand Down Expand Up @@ -61,7 +61,7 @@ trigger:
- push
steps:
- name: build android
image: cirrusci/flutter:2.8.0
image: cirrusci/flutter:2.8.1
commands:
# Keep track of the time when build was started
- echo $(date -Iseconds) > BUILD_START_TIME
Expand Down Expand Up @@ -115,7 +115,7 @@ trigger:
- push
steps:
- name: build linux
image: cirrusci/flutter:2.8.0
image: cirrusci/flutter:2.8.1
commands:
# Install dependencies
- apt-get update -y
Expand All @@ -128,9 +128,9 @@ steps:
- flutter config --enable-linux-desktop
# Build the linux app exec
- flutter build linux --release
- cp -a /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
- cp -a /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
- cp -a /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
- tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/x64/release/bundle .

- name: release linux
Expand Down Expand Up @@ -159,7 +159,7 @@ steps:
# - push
#steps:
# - name: build linux
# image: cirrusci/flutter:2.8.0
# image: cirrusci/flutter:2.8.1
# commands:
# # Install dependencies
# - apt-get update -y
Expand All @@ -172,9 +172,9 @@ steps:
# - flutter config --enable-linux-desktop
# # Build the linux app exec
# - flutter build linux --release
# - cp -a /usr/lib/aarch64-linux-gnu/libjsoncpp.so* build/linux/arm64/release/bundle/lib/
# - cp -a /usr/lib/aarch64-linux-gnu/libsqlite3.so build/linux/arm64/release/bundle/lib/
# - cp -a /usr/lib/aarch64-linux-gnu/libsqlcipher.so build/linux/arm64/release/bundle/lib/
# - cp -aL /usr/lib/aarch64-linux-gnu/libjsoncpp.so* build/linux/arm64/release/bundle/lib/
# - cp -aL /usr/lib/aarch64-linux-gnu/libsqlite3.so build/linux/arm64/release/bundle/lib/
# - cp -aL /usr/lib/aarch64-linux-gnu/libsqlcipher.so build/linux/arm64/release/bundle/lib/
# - tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/arm64/release/bundle .

# - name: release linux
Expand Down Expand Up @@ -204,7 +204,7 @@ trigger:
- push
steps:
- name: build linux
image: cirrusci/flutter:2.8.0
image: cirrusci/flutter:2.8.1
commands:
# Install dependencies
- apt-get update -y
Expand All @@ -217,9 +217,9 @@ steps:
- flutter config --enable-linux-desktop
# Build the linux app exec
- flutter build linux --release
- cp -a /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
- cp -a /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
- cp -a /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libjsoncpp.so* build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlite3.so build/linux/x64/release/bundle/lib/
- cp -aL /usr/lib/x86_64-linux-gnu/libsqlcipher.so build/linux/x64/release/bundle/lib/
- tar -cvzf syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).linux.x64.tar.gz -C build/linux/x64/release/bundle .

- name: release linux
Expand Down
2 changes: 1 addition & 1 deletion .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "2.8.0",
"flutterSdkVersion": "2.8.1",
"flavors": {}
}
13 changes: 7 additions & 6 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,23 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application
android:name="io.flutter.app.FlutterApplication"
android:name="${applicationName}"
android:label="Syphon"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher">
<service
android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false"/>
<receiver
android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
android:exported="false"/>
<receiver
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
android:enabled="false">
android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
android:enabled="false"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin path_provider, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.baseflow.permissionhandler.PermissionHandlerPlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin permission_handler, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
1 change: 0 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
org.gradle.java.home=/Library/Java/JavaVirtualMachines/openjdk-14.0.1.jdk/Contents/Home
distributionSha256Sum=3fd824892df8ad5847be6e4fb7d3600068437de172939fd657cc280a1a629f63
distributionSha256Sum=b13f5d97f08000996bf12d9dd70af3f2c6b694c2c663ab1b545e9695562ad1ee
14 changes: 0 additions & 14 deletions assets/app_logo.svg

This file was deleted.

Loading

0 comments on commit 525ea76

Please sign in to comment.