android w/ ghc 8.10

ChangeLog.md

@@ -4,11 +4,23 @@ This project's release branch is `master`. This log is written from the perspect
 
 ## Unreleased
 
+* Bump
+  * Nixpkgs to 21.05
+  * Android: Use gradle v7 and build-tools 30.0.2 by default
+
+* Android: Automatically set build tool version in gradle.properties based on the configured `buildToolsVersions`
+
+## Unreleased
+
 * Fix SIGBUS crashes on armv7a due unaligned writes ([!774](https://github.com/reflex-frp/reflex-platform/pull/774))
 * Always use GHC 8.10.7, not GHC 8.10.4, for GHC 8.10.
   Previously we were using mixed GHC 8.10 versions to avoid issues.
 * GHC 8.10 support is complete, with the remaining profiling builds
   that worked for 8.6 (everything but GHCJS's) now also working for 8.10.
+* *Breaking Change*: The `javaSources` argument of `android/default.nix` is now
+  a function that takes the default sources as arguments instead of a list that
+  is always appended to the default sources. It is now possible to override the
+  default java sources. See the documentation [here](android/default.nix).
 
 * GHCJS 8.6 no longer uses older versions of some libraries with "text JS-string"
 
@@ -28,6 +40,11 @@ This project's release branch is `master`. This log is written from the perspect
   * all-cabal-hashes "Update from Hackage at 2022-01-20T19:38:07Z"
   * dependent-sum-template to 0.1.1.0
   * some to 1.0.2
+  * monoidal-containers to 0.6.2.0
+  * witherable to 0.4.2
+  * patch to 0.0.7.0
+  * reflex-vty to 0.2.0.1
+  * reflex-ghci to 0.1.5.3
 
   Prerequisite bumps:
 

HACKING.md

@@ -31,9 +31,9 @@ Many different platform are provided for you. A partial list of
 possible platforms include:
 
 - ghc
-- ghc8_6
+- ghc8_10
 - ghcjs
-- ghcjs8_6
+- ghcjs8_10
 
 In addition, instead of specifying the name of the platform, you can
 specify a path to a Nix expression file representing a Haskell

android/build-gradle-app.nix

@@ -1,8 +1,8 @@
-{ stdenv, androidenv, jdk, gnumake, gawk, file
+{ stdenv, lib, androidenv, jdk, gnumake, gawk, file
 , which, gradle, fetchurl, buildEnv, runCommand }:
 
 args@{ name, src, platformVersions ? [ "8" ]
-     , buildToolsVersions ? [ "28.0.3" ]
+     , buildToolsVersions ? [ "30.0.2" ]
      , useGoogleAPIs ? false, useGooglePlayServices ? false
      , release ? false, keyStore ? null, keyAlias ? null
      , keyStorePassword ? null, keyAliasPassword ? null
@@ -16,7 +16,7 @@ assert release -> keyAliasPassword != null;
 assert acceptAndroidSdkLicenses;
 
 let
-  inherit (stdenv.lib) optionalString optional;
+  inherit (lib) optionalString optional;
 
   m2install = { repo, version, artifactId, groupId
               , jarSha256, pomSha256, aarSha256, suffix ? ""
@@ -48,6 +48,7 @@ let
        '');
   androidsdkComposition = androidenv.composeAndroidPackages {
     inherit platformVersions useGoogleAPIs buildToolsVersions;
+    includeNDK = true;
     includeExtras = [ "extras;android;m2repository" ]
       ++ optional useGooglePlayServices "extras;google;google_play_services";
   };
@@ -59,7 +60,7 @@ stdenv.mkDerivation ({
   ANDROID_HOME = "${androidsdkComposition.androidsdk}/libexec";
   ANDROID_NDK_HOME = "${androidsdkComposition.ndk-bundle}/libexec/android-sdk/ndk-bundle";
 
-  buildInputs = [ jdk gradle ] ++ buildInputs ++ stdenv.lib.optional useNDK [ androidsdkComposition.ndk-bundle gnumake gawk file which ];
+  buildInputs = [ jdk gradle ] ++ buildInputs ++ lib.optional useNDK [ androidsdkComposition.ndk-bundle gnumake gawk file which ];
 
   DEPENDENCIES = buildEnv { name = "${name}-maven-deps";
                             paths = map m2install mavenDeps;
@@ -74,6 +75,9 @@ stdenv.mkDerivation ({
         echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}"
       ) >> gradle.properties
     ''}
+    ${optionalString (builtins.length buildToolsVersions > 0) ''
+      echo "android.aapt2FromMavenOverride=local_sdk/android-sdk/build-tools/${builtins.head buildToolsVersions}/aapt2" >> gradle.properties
+    ''}
     buildDir=`pwd`
     cp -rL $ANDROID_HOME $buildDir/local_sdk
     chmod -R 755 local_sdk
@@ -100,10 +104,12 @@ stdenv.mkDerivation ({
 
   installPhase = ''
     mkdir -p $out
-    cp -RL build/outputs/apk/*/*.apk $out
+    ${if gradleTask == "bundleRelease"
+    then "cp -RL build/outputs/bundle/release/*.aab $out"
+    else "cp -RL build/outputs/apk/*/*.apk $out"}
   '';
 
   meta = {
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 } // builtins.removeAttrs args ["name" "mavenDeps"])

android/build.gradle.nix

@@ -9,11 +9,15 @@
 ''
 buildscript {
     repositories {
-        mavenLocal()
+        mavenLocal {
+          metadataSources {
+            mavenPom()
+            artifact()
+          }
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.android.tools.lint:lint:26.4.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         ${googleServicesClasspath}
     }
 }
@@ -28,15 +32,20 @@ task proguard(type: proguard.gradle.ProGuardTask) {
 
 allprojects {
     repositories {
-        mavenLocal()
+        mavenLocal {
+          metadataSources {
+            mavenPom()
+            artifact()
+          }
+        }
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     sourceSets {
       main {
@@ -47,10 +56,16 @@ android {
         jniLibs.srcDir 'lib'
       }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "${applicationId}"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode ${version.code}
         versionName "${version.name}"
         multiDexEnabled false

android/buildIcons.nix

@@ -1,8 +1,17 @@
-{ runCommand, imagemagick }:
-{ src }:
+{ runCommand, imagemagick, lib }:
+{ src ? null # Base raster image for fixed-size icons (must be a path)
+, adaptiveIcon ? null
+  # Path to a XML file containing the adaptive icon specification (SDK
+  # 26 and up).
+}:
+let
+  rasterInput =
+    if (src == null) && (adaptiveIcon == null)
+      then abort "Either src or adaptiveIcon must be specified!"
+      else src;
+in
 runCommand "android-icons" {
-  inherit src;
-  buildCommand = ''
+  buildCommand = lib.optionalString (src != null) ''
     mkdir "$out"
 
     launcherIconSize() {
@@ -20,8 +29,11 @@ runCommand "android-icons" {
     for x in l m tv h xh xxh xxxh ; do
       local dir="$out/drawable-''${x}dpi"
       mkdir "$dir"
-      convert -resize "$(launcherIconSize "$x")" -flatten "$src" "$dir/ic_launcher.png"
+      convert -resize "$(launcherIconSize "$x")" -flatten "${rasterInput}" "$dir/ic_launcher.png"
     done
+  '' + lib.optionalString (adaptiveIcon != null) ''
+    mkdir -p "$out/mipmap-anydpi-v26/"
+    cp "${adaptiveIcon}" "$out/mipmap-anydpi-v26/ic_launcher.xml"
   '';
   nativeBuildInputs = [
     imagemagick

android/default.nix

@@ -109,8 +109,14 @@ in rec {
       # You need to patch soname in make files of libraries to link against
       # unversioned libraries.
 
-    , javaSources ? []
-      # A list of additional Java source directories to include in the APK build
+    , javaSources ? (androidActivitySrc: mainWidgetSrc: [ androidActivitySrc mainWidgetSrc ])
+      # A function that is used to build the list of android source files. The
+      # arguments to this function are:
+      #   * The default android-activity java source tree (from the [android-activity package](https://hackage.haskell.org/package/android-activity))
+      #   * The default "main widget" java source tree (from [reflex-dom](https://github.com/reflex-frp/reflex-dom/blob/develop/reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java))
+      # Those arguments can be selectively ignored and replaced with alternate
+      # implementations. Additional Java source directories can also be added
+      # to the list for inclusion in the APK build
 
     , universalApk ? true
       # Set this to false to build one APK per target platform.  This will