From 9f2ebcd179432dc99d247431872522678d107434 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Mon, 6 Apr 2026 20:34:49 -0700
Subject: [PATCH] introduce new legacy_threading build tag, build is now
 migrated by default

---
 .github/workflows/mobile_tests.yml     | 2 +-
 .github/workflows/platform_tests.yml   | 6 +++---
 cmd/fyne/internal/commands/build.go    | 4 ++--
 internal/async/map.go                  | 2 +-
 internal/async/map_clear.go            | 2 +-
 internal/async/map_clear_go1.23.go     | 2 +-
 internal/async/map_migratedfynedo.go   | 2 +-
 internal/async/queue.go                | 2 +-
 internal/async/queue_migratedfynedo.go | 2 +-
 internal/build/build.go                | 2 +-
 internal/build/migrated_fynedo.go      | 2 +-
 internal/build/migrated_notfynedo.go   | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/mobile_tests.yml b/.github/workflows/mobile_tests.yml
index 73db1a6f86..392ff57987 100644
--- a/.github/workflows/mobile_tests.yml
+++ b/.github/workflows/mobile_tests.yml
@@ -32,7 +32,7 @@ jobs:
         run: echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
 
       - name: Tests
-        run: xvfb-run go test -race -tags mobile,ci,migrated_fynedo ./...
+        run: xvfb-run go test -race -tags mobile,ci ./...
 
       - name: Compile
         working-directory: cmd/fyne_demo
diff --git a/.github/workflows/platform_tests.yml b/.github/workflows/platform_tests.yml
index 213a544c22..e133b25131 100644
--- a/.github/workflows/platform_tests.yml
+++ b/.github/workflows/platform_tests.yml
@@ -14,9 +14,9 @@ jobs:
         include:
           - os: ubuntu-latest
             runner: xvfb-run
-            tags: ci,migrated_fynedo
+            tags: ci
           - os: macos-latest
-            tags: no_glfw,ci,migrated_fynedo
+            tags: no_glfw,ci
 
     steps:
       - uses: actions/checkout@v5
@@ -74,4 +74,4 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Tests
-        run: ${{ matrix.runner }} go test -race -tags no_glfw,migrated_fynedo ./...
+        run: ${{ matrix.runner }} go test -race -tags no_glfw ./...
diff --git a/cmd/fyne/internal/commands/build.go b/cmd/fyne/internal/commands/build.go
index 7239e4b0a2..553fc75c76 100644
--- a/cmd/fyne/internal/commands/build.go
+++ b/cmd/fyne/internal/commands/build.go
@@ -230,8 +230,8 @@ func (b *Builder) build() error {
 	if b.release {
 		tags = append(tags, "release")
 	}
-	if ok, set := b.appData.Migrations["fyneDo"]; ok && set {
-		tags = append(tags, "migrated_fynedo")
+	if ok, set := b.appData.Migrations["fyneDo"]; ok && !set {
+		tags = append(tags, "legacy_threading")
 	}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
diff --git a/internal/async/map.go b/internal/async/map.go
index e3aa859c94..510bfc39ce 100644
--- a/internal/async/map.go
+++ b/internal/async/map.go
@@ -1,4 +1,4 @@
-//go:build !migrated_fynedo
+//go:build legacy_threading
 
 package async
 
diff --git a/internal/async/map_clear.go b/internal/async/map_clear.go
index d365103273..8889bef9d5 100644
--- a/internal/async/map_clear.go
+++ b/internal/async/map_clear.go
@@ -1,4 +1,4 @@
-//go:build !go1.23 && !migrated_fynedo
+//go:build !go1.23 && legacy_threading
 
 package async
 
diff --git a/internal/async/map_clear_go1.23.go b/internal/async/map_clear_go1.23.go
index c3ea5d6e9a..2e2cf864b8 100644
--- a/internal/async/map_clear_go1.23.go
+++ b/internal/async/map_clear_go1.23.go
@@ -1,4 +1,4 @@
-//go:build go1.23 && !migrated_fynedo
+//go:build go1.23 && legacy_threading
 
 package async
 
diff --git a/internal/async/map_migratedfynedo.go b/internal/async/map_migratedfynedo.go
index bd7fa39b9d..37ec327ef5 100644
--- a/internal/async/map_migratedfynedo.go
+++ b/internal/async/map_migratedfynedo.go
@@ -1,4 +1,4 @@
-//go:build migrated_fynedo
+//go:build !legacy_threading
 
 package async
 
diff --git a/internal/async/queue.go b/internal/async/queue.go
index 71681eaaee..70bd404fa6 100755
--- a/internal/async/queue.go
+++ b/internal/async/queue.go
@@ -1,4 +1,4 @@
-//go:build !migrated_fynedo
+//go:build legacy_threading
 
 package async
 
diff --git a/internal/async/queue_migratedfynedo.go b/internal/async/queue_migratedfynedo.go
index 2f12a868ce..ed44f425e1 100644
--- a/internal/async/queue_migratedfynedo.go
+++ b/internal/async/queue_migratedfynedo.go
@@ -1,4 +1,4 @@
-//go:build migrated_fynedo
+//go:build !legacy_threading
 
 package async
 
diff --git a/internal/build/build.go b/internal/build/build.go
index 8567284fcd..9d2566d4d9 100644
--- a/internal/build/build.go
+++ b/internal/build/build.go
@@ -10,7 +10,7 @@ import (
 var (
 	migrateCheck sync.Once
 
-	migratedFyneDo bool
+	migratedFyneDo bool = true
 )
 
 func MigratedToFyneDo() bool {
diff --git a/internal/build/migrated_fynedo.go b/internal/build/migrated_fynedo.go
index 089f766dce..a799f8a5b5 100644
--- a/internal/build/migrated_fynedo.go
+++ b/internal/build/migrated_fynedo.go
@@ -1,4 +1,4 @@
-//go:build migrated_fynedo
+//go:build !legacy_threading
 
 package build
 
diff --git a/internal/build/migrated_notfynedo.go b/internal/build/migrated_notfynedo.go
index a9fbdd5479..a99fe02d92 100644
--- a/internal/build/migrated_notfynedo.go
+++ b/internal/build/migrated_notfynedo.go
@@ -1,4 +1,4 @@
-//go:build !migrated_fynedo
+//go:build legacy_threading
 
 package build