diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4459c6..b36564a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,12 +35,27 @@ jobs: - name: Run lints run: flutter analyze - - name: Run dartfmt - run: dartfmt --dry-run --set-exit-if-changed . + - name: Check formatting + run: flutter format --dry-run --set-exit-if-changed . - name: Run tests run: flutter test + - name: Inject keystore + working-directory: android + env: + KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + ALIAS: ${{ secrets.ALIAS }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + run: | + echo storePassword=$KEY_STORE_PASSWORD > key.properties + echo keyPassword=$KEY_PASSWORD >> key.properties + echo keyAlias=$ALIAS >> key.properties + echo storeFile=$HOME/key.jks >> key.properties + + echo $SIGNING_KEY | base64 -d | tee ~/key.jks >/dev/null + - name: Android build run: flutter build apk --split-per-abi diff --git a/android/app/build.gradle b/android/app/build.gradle index da27aec..3af13b8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,8 +25,14 @@ 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 28 + compileSdkVersion 30 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -37,21 +43,27 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.lemmur" + applicationId "com.krawieck.lemmur" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } - 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 - } - } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + } + } } flutter { diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 69fdad9..b1a7e38 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.krawieck.lemmur"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a2859cf..7f730ee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.krawieck.lemmur"> diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c79c9d4..a435fbd 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -378,7 +378,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.lemmur; + PRODUCT_BUNDLE_IDENTIFIER = com.krawieck.lemmur; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -515,7 +515,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.lemmur; + PRODUCT_BUNDLE_IDENTIFIER = com.krawieck.lemmur; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -546,7 +546,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.lemmur; + PRODUCT_BUNDLE_IDENTIFIER = com.krawieck.lemmur; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -580,4 +580,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} \ No newline at end of file +} diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 3087563..55f74ae 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) set(BINARY_NAME "lemmur") -set(APPLICATION_ID "com.example.lemmur") +set(APPLICATION_ID "com.krawieck.lemmur") cmake_policy(SET CMP0063 NEW)