3
0
Fork 0

Merge pull request #25 from JohnMaguire/fix-build

Minor tweaks for a clean build
This commit is contained in:
John Maguire 2021-04-22 18:56:00 -04:00 committed by GitHub
commit 10d6b6bb9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions

View File

@ -5,6 +5,14 @@
- [`android-studio`](https://developer.android.com/studio) - [`android-studio`](https://developer.android.com/studio)
- [Enable NDK](https://developer.android.com/studio/projects/install-ndk) Check local.properties for current NDK version - [Enable NDK](https://developer.android.com/studio/projects/install-ndk) Check local.properties for current NDK version
Downgrade flutter to a 1.x release (the following worked on an AUR install of `flutter`)
```
cd $(dirname $(readlink $(which flutter)))
git checkout 1.22.6
flutter doctor
```
Copy env.sh.example to env.sh and update your PATH variable to expose both flutter and go bin directories Copy env.sh.example to env.sh and update your PATH variable to expose both flutter and go bin directories
```export PATH="$PATH:/path/to/go/bin:/path/to/flutter/bin``` ```export PATH="$PATH:/path/to/go/bin:/path/to/flutter/bin```

View File

@ -66,6 +66,7 @@ android {
// We are disabling minification and proguard because it wrecks the crypto for storing keys // We are disabling minification and proguard because it wrecks the crypto for storing keys
// Ideally we would turn these on. We had issues with gson as well but resolved those with proguardFiles // Ideally we would turn these on. We had issues with gson as well but resolved those with proguardFiles
shrinkResources false
minifyEnabled false minifyEnabled false
useProguard false useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

View File

@ -16,6 +16,7 @@ if [ "$1" = "ios" ]; then
elif [ "$1" = "android" ]; then elif [ "$1" = "android" ]; then
# Build nebula for android # Build nebula for android
make mobileNebula.aar make mobileNebula.aar
mkdir -p ../android/app/src/main/libs
rm -rf ../android/app/src/main/libs/mobileNebula.aar rm -rf ../android/app/src/main/libs/mobileNebula.aar
cp mobileNebula.aar ../android/app/src/main/libs/mobileNebula.aar cp mobileNebula.aar ../android/app/src/main/libs/mobileNebula.aar
@ -48,4 +49,4 @@ cd ..
# Try and avoid issues with building by moving into place after we are complete # Try and avoid issues with building by moving into place after we are complete
#TODO: this might be a parallel build of deps issue in kotlin, might need to solve there #TODO: this might be a parallel build of deps issue in kotlin, might need to solve there
mv lib/.gen.versions.dart lib/gen.versions.dart mv lib/.gen.versions.dart lib/gen.versions.dart