Compare revisions

Benoît Harrault · Benoît Harrault · Benoît Harrault · Benoît Harrault · Benoît Harrault · Benoît Harrault
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,14 +23,27 @@ android:build-debug:
    - echo keyAlias=$ANDROID_DEBUG_KEY_ALIAS >> android/key.properties
    - echo keyPassword=$ANDROID_DEBUG_KEY_PASSWORD >> android/key.properties
    # build flutter app
+    - VERSION_NAME="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f1)"
+    - echo "${VERSION_NAME}"
+    - VERSION_CODE="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f2)"
+    - echo "${VERSION_CODE}"
    - flutter packages get
    - flutter clean
+    - flutter build apk --debug --split-per-abi
    - flutter build apk --debug
    # prepare artifact
-    - find . -name "*.apk" # where is my apk?
+    - BASE_APK_FOLDER="build/app/outputs/flutter-apk"
+    - APP_NAME="$(grep 'namespace' android/app/build.gradle | cut -d'"' -f2)"
+    - >
+      if [ "$(find "${BASE_APK_FOLDER}" -name "*.apk")" != "" ]; then
+        for APK in ${BASE_APK_FOLDER}/*.apk; do
+          mv -v "${APK}" "$(echo "${APK}" | sed "s|\.apk|_${VERSION_CODE}.apk|" | sed "s|/app-|/${APP_NAME}-|")"
+        done
+      fi
+    - find "${BASE_APK_FOLDER}" -name "*.apk" # where are my apk?
  artifacts:
    paths:
-      - build/app/outputs/apk/debug
+      - build/app/outputs/flutter-apk
    expire_in: 1 week
  interruptible: true

@@ -52,9 +65,12 @@ android:build-release:
    - echo keyAlias=$ANDROID_KEY_ALIAS >> android/key.properties
    - echo keyPassword=$ANDROID_KEY_PASSWORD >> android/key.properties
    # build flutter app
-    - VERSION_FILE="$(find . -name 'gradle.properties' | head -n1)"
-    - VERSION_NAME="$(grep '^app.versionName=' "${VERSION_FILE}" | cut -d'=' -f2)"
-    - VERSION_CODE="$(grep '^app.versionCode=' "${VERSION_FILE}" | cut -d'=' -f2)"
+    - BASE_APK_FOLDER="build/app/outputs/flutter-apk"
+    - echo "${BASE_APK_FOLDER}"
+    - mkdir -p "${BASE_APK_FOLDER}"
+    - VERSION_NAME="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f1)"
+    - VERSION_CODE="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f2)"
+    - APP_NAME="$(grep 'namespace' android/app/build.gradle | cut -d'"' -f2)"
    - TAG_NAME="Release_${VERSION_NAME}_${VERSION_CODE}"
    - echo "${TAG_NAME}"
    - >
@@ -63,13 +79,20 @@ android:build-release:
      else
        flutter packages get
        flutter clean
+        flutter build apk --release --split-per-abi
        flutter build apk --release
      fi
    # prepare artifact
-    - find . -name "*.apk" # where is my apk?
+    - >
+      if [ "$(find "${BASE_APK_FOLDER}" -name "*.apk")" != "" ]; then
+        for APK in ${BASE_APK_FOLDER}/*.apk; do
+          mv -v "${APK}" "$(echo "${APK}" | sed "s|\.apk|_${VERSION_CODE}.apk|" | sed "s|/app-|/${APP_NAME}-|")"
+        done
+      fi
+    - find "${BASE_APK_FOLDER}" -name "*.apk" # where are my apk?
  artifacts:
    paths:
-      - build/app/outputs/apk/release
+      - build/app/outputs/flutter-apk
    expire_in: 1 week
  interruptible: true

@@ -89,9 +112,8 @@ application:release:
    - git config user.email "${GITLAB_USER_EMAIL}"
    - git config user.name "${GITLAB_USER_NAME}"
    - git remote set-url origin https://oauth2:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}
-    - VERSION_FILE="$(find . -name 'gradle.properties' | head -n1)"
-    - VERSION_NAME="$(grep '^app.versionName=' "${VERSION_FILE}" | cut -d'=' -f2)"
-    - VERSION_CODE="$(grep '^app.versionCode=' "${VERSION_FILE}" | cut -d'=' -f2)"
+    - VERSION_NAME="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f1)"
+    - VERSION_CODE="$(grep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f2)"
    - TAG_NAME="Release_${VERSION_NAME}_${VERSION_CODE}"
    - echo "${TAG_NAME}"
    - >

--- a/android/.gitignore
+++ b/android/.gitignore
@@ -7,5 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java

 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
+**/*.keystore
+**/*.jks
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -4,32 +4,6 @@ plugins {
    id "dev.flutter.flutter-gradle-plugin"
 }

-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def gradleProperties = new Properties()
-def gradlePropertiesFile = rootProject.file('gradle.properties')
-if (gradlePropertiesFile.exists()) {
-    gradlePropertiesFile.withReader('UTF-8') { reader ->
-        gradleProperties.load(reader)
-    }
-}
-
-def appVersionCode = gradleProperties.getProperty('app.versionCode')
-if (appVersionCode == null) {
-    appVersionCode = '1'
-}
-
-def appVersionName = gradleProperties.getProperty('app.versionName')
-if (appVersionName == null) {
-    appVersionName = '1.0'
-}
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -37,33 +11,69 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    compileSdkVersion 33
-    namespace "org.benoitharrault.reversi"
+    namespace = "org.benoitharrault.reversi"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }

    defaultConfig {
-        applicationId "org.benoitharrault.reversi"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 30
-        versionCode appVersionCode.toInteger()
-        versionName appVersionName
-        archivesBaseName = "$applicationId" + "_" + "$versionCode"
+        applicationId = "org.benoitharrault.reversi"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
    }

    signingConfigs {
        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
        }
    }
    buildTypes {
        release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
+        }
+    }
+
+    splits {
+        abi {
+            reset()
+            include 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
        }
    }
 }

+ext.abiCodes = [
+    'x86': 1,
+    'x86_64': 2,
+    'armeabi': 3,
+    'armeabi-v7a': 4,
+    'arm64-v8a': 5,
+]
+
+import com.android.build.OutputFile
+
+android.applicationVariants.all { variant ->
+  variant.outputs.each { output ->
+    def perAbiVersionCodeIncrement = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+
+    if (perAbiVersionCodeIncrement != null) {
+      output.versionCodeOverride = variant.versionCode * 1000 + perAbiVersionCodeIncrement
+    }
+  }
+}
+
 flutter {
-    source '../..'
+    source = "../.."
 }
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.benoitharrault.reversi">
-    <!-- Flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.benoitharrault.reversi">
-   <application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
        android:label="reversi"
+        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher">
        <activity
            android:name=".MainActivity"
+            android:exported="true"
            android:launchMode="singleTop"
+            android:taskAffinity=""
            android:theme="@style/LaunchTheme"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:hardwareAccelerated="true"
@@ -27,4 +29,10 @@
            android:name="flutterEmbedding"
            android:value="2" />
    </application>
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>
--- a/android/app/src/main/java/org/benoitharrault/reversi/MainActivity.java
+++ b/android/app/src/main/java/org/benoitharrault/reversi/MainActivity.java
-package org.benoitharrault.reversi;
-
-import io.flutter.embedding.android.FlutterActivity;
-
-public class MainActivity extends FlutterActivity {
-}
--- a/android/app/src/main/kotlin/org/benoitharrault/reversi/MainActivity.kt
+++ b/android/app/src/main/kotlin/org/benoitharrault/reversi/MainActivity.kt
+package org.benoitharrault.reversi
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.benoitharrault.reversi">
-    <!-- Flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,12 +5,12 @@ allprojects {
    }
 }

-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
    project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }

 tasks.register("clean", Delete) {

--- a/android/gradle.properties
+++ b/android/gradle.properties
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.17
-app.versionCode=17
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -5,10 +5,9 @@ pluginManagement {
        def flutterSdkPath = properties.getProperty("flutter.sdk")
        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
        return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()

-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

    repositories {
        google()
@@ -19,8 +18,8 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.2.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }

 include ":app"
--- a/fastlane/metadata/android/en-US/changelogs/18.txt
+++ b/fastlane/metadata/android/en-US/changelogs/18.txt
+Improve build process, split packages per ABI.
--- a/fastlane/metadata/android/en-US/changelogs/19.txt
+++ b/fastlane/metadata/android/en-US/changelogs/19.txt
+Re-order ABI builds.
--- a/fastlane/metadata/android/fr-FR/changelogs/18.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/18.txt
+Amélioration du processus de construction. Éclatement des packages par ABI.
--- a/fastlane/metadata/android/fr-FR/changelogs/19.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/19.txt
+Correction sur l'ordre de builds ABI.
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
    dependency: "direct main"
    description:
      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
      url: "https://pub.dev"
    source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
  characters:
    dependency: transitive
    description:
@@ -29,18 +29,18 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  file:
    dependency: transitive
    description:
      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -50,10 +50,10 @@ packages:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "5.0.0"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@@ -63,26 +63,26 @@ packages:
    dependency: transitive
    description:
      name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
+    version: "5.0.0"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
  meta:
    dependency: transitive
    description:
      name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
  nested:
    dependency: transitive
    description:
@@ -119,18 +119,18 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
  platform:
    dependency: transitive
    description:
      name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
  plugin_platform_interface:
    dependency: transitive
    description:
@@ -151,58 +151,58 @@ packages:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.2"
+    version: "2.3.2"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.3.3"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.5"
+    version: "2.5.3"
  shared_preferences_linux:
    dependency: transitive
    description:
      name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  shared_preferences_platform_interface:
    dependency: transitive
    description:
      name: shared_preferences_platform_interface
-      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  shared_preferences_web:
    dependency: transitive
    description:
      name: shared_preferences_web
-      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.2"
  shared_preferences_windows:
    dependency: transitive
    description:
      name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  sky_engine:
    dependency: transitive
    description: flutter
@@ -220,26 +220,18 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.0"
+    version: "1.1.0"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
 name: simpler_reversi
 description: A reversi game application.
 publish_to: 'none'
-version: 0.0.17+17
+version: 0.1.1+19

 environment:
  sdk: '^3.0.0'
@@ -14,7 +14,7 @@ dependencies:
  async: ^2.11.0

 dev_dependencies:
-  flutter_lints: ^3.0.1
+  flutter_lints: ^5.0.0

 flutter:
  uses-material-design: true
No results found