diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 98cce616..d238ad76 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,4 @@ open_collective: spotube -ko_fi: krtirtho patreon: krtirtho custom: - "https://www.buymeacoffee.com/krtirtho" diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 15a2ab5a..b262c896 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -35,6 +35,8 @@ jobs: build/Spotube-linux-x86_64.tar.xz build/Spotube-*-x86_64.AppImage # Building Android Application + - run: echo ${{ secrets.KEYSTORE }} | base64 --decode > upload-keystore.jks + - run: echo ${{ secrets.KEY_PROPERTIES }} > android/key.properties - run: flutter build apk - run: make apk - uses: actions/upload-artifact@v2 diff --git a/.gitignore b/.gitignore index fec026d4..cd61c4e3 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ app.*.map.json /android/app/profile /android/app/release - *.pkg.tar.zst /aur-struct/*.tar /aur-struct/src @@ -73,4 +72,6 @@ help.txt secrets.json dist -appimage-build \ No newline at end of file +appimage-build + +android/key.properties diff --git a/android/app/build.gradle b/android/app/build.gradle index f162c8cb..ec24101b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,6 +25,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + android { compileSdkVersion 31 @@ -51,11 +57,17 @@ android { multiDexEnabled true } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } }