Merge pull request #829 from reflex-frp/aa/reflex-dom-0.6.2.0

Update reflex-dom to 0.6.3.0; Target android sdk 33 while using sdk 30 to build

ChangeLog.md

@@ -2,6 +2,13 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+## Unreleased
+
+* Haskell Library Updated
+  * reflex-dom 0.6.3.0
+  * android-activity 0.2.0.0
+* Update android target sdk version to 33
+
 ## v1.1.1.0 - 2023-08-01
 
 * Haskell Library Updated

android/build.gradle.nix

@@ -44,7 +44,7 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
     buildToolsVersion '30.0.2'
 
     lintOptions {
@@ -70,7 +70,7 @@ android {
     defaultConfig {
         applicationId "${applicationId}"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode ${version.code}
         versionName "${version.name}"
         multiDexEnabled false

android/impl.nix

@@ -36,7 +36,7 @@ in {
     keyStore = releaseKey.storeFile or null;
     keyStorePassword = releaseKey.storePassword or null;
     name = applicationId;
-    platformVersions = [ "31" ];
+    platformVersions = [ "30" ];
     release = false;
     src =
       let splitApplicationId = splitString "." applicationId;

default.nix

@@ -170,7 +170,7 @@ let iosSupport = system == "x86_64-darwin";
         aarch64 = {
           crossSystem = lib.systems.examples.aarch64-android-prebuilt //
           { isStatic = true; };
-          sdkVer = "31";
+          sdkVer = "30";
         };
         aarch32 = {
           crossSystem = lib.systems.examples.armv7a-android-prebuilt // {

haskell-overlays/android/dep/android-activity/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "android-activity",
-  "branch": "rune/fix-ghc810-linker-error",
+  "branch": "release/0.2.0.0",
   "private": false,
-  "rev": "c5bcac51b05a4dfb85c29aec5a1c0704ec25e63a",
-  "sha256": "1617kwgpw8sh36hmi6yf4ypy6b36h6fdlbmv6npx7jk3nnkk3s5c"
+  "rev": "2e6883ea46dfaebc06fa6a31a22a576c60a071b8",
+  "sha256": "0fbkaax90c9fsgvw00d04rvl1hprchj02dvnywnqrh14qipkxckh"
 }

haskell-overlays/android/dep/android-activity/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

haskell-overlays/reflex-packages/dep/reflex-dom/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "branch": "release/reflex-dom-core/0.8.0.0",
+  "branch": "release/reflex-dom/0.6.3.0",
   "private": false,
-  "rev": "f14e954310115cd0d2d1679e1059a3e588ad4762",
-  "sha256": "0fdil74zq7d6drc1lzx3nfdsajqfw5p3llqkakvh6ga207s8ll97"
+  "rev": "39195afb34cf7d4f02df9d891ccadad9eebceb6c",
+  "sha256": "06yp8h94p9fqr4gkhj46vs56rvr446cdwmixi9pijyqzlnvp132j"
 }