From 49e2254e79279eedc6dd451ece2f3cf92238a3a7 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Tue, 13 Sep 2022 23:33:20 +0900
Subject: [PATCH] .github/workflows: drop Go 1.15 support

Updates #2323
---
 .github/workflows/test.yml        | 22 +++++++++++-----------
 ebitenutil/{fs_go116.go => fs.go} |  3 ---
 go.mod                            |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)
 rename ebitenutil/{fs_go116.go => fs.go} (97%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ae741162..381925657 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        go: ['1.15.x', '1.16.x', '1.17.x', '1.18.x', '1.19.x']
+        go: ['1.16.x', '1.17.x', '1.18.x', '1.19.x']
     name: Test with Go ${{ matrix.go }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
@@ -54,7 +54,7 @@ jobs:
           mv ./wasmbrowsertest${{ startsWith(matrix.os, 'windows-') && '.exe' || '' }} $(go env GOPATH)/bin/go_js_wasm_exec${{ startsWith(matrix.os, 'windows-') && '.exe' || '' }}
 
       - name: Prepare ebitenmobile test
-        if: ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') }}
+        if: ${{ !startsWith(matrix.go, '1.16.') }}
         run: |
           local_ebiten=$(pwd)
           cd /tmp
@@ -91,12 +91,12 @@ jobs:
           env GOOS=windows GOARCH=arm go build -tags=example -v ./...
 
       - name: go build (Windows ARM64)
-        if: ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') }}
+        if: ${{ !startsWith(matrix.go, '1.16.') }}
         run: |
           env GOOS=windows GOARCH=arm64 go build -tags=example -v ./...
 
       - name: go build (macOS)
-        if: ${{ startsWith(matrix.os, 'macos-') && !startsWith(matrix.go, '1.15.') }}
+        if: ${{ startsWith(matrix.os, 'macos-') }}
         run: |
           env CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=example -v ./...
           env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=example -o flappy_amd64 -v ./examples/flappy
@@ -132,7 +132,7 @@ jobs:
         # TODO: Add more test environments (#1305)
         if: ${{ startsWith(matrix.os, 'ubuntu-') || startsWith(matrix.os, 'windows-') }}
         run: |
-          go test -tags=example ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
+          go test -tags=example ${{ !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
 
       - name: go test (Linux 386)
         if: ${{ startsWith(matrix.os, 'ubuntu-') }}
@@ -141,30 +141,30 @@ jobs:
           sudo apt-get update
           sudo apt-get install gcc-multilib
           sudo apt-get install libasound2-dev:i386 libgl1-mesa-dev:i386 libxcursor-dev:i386 libxi-dev:i386 libxinerama-dev:i386 libxrandr-dev:i386 libxxf86vm-dev:i386
-          env CGO_ENABLED=1 GOARCH=386 go test -tags=example ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
+          env CGO_ENABLED=1 GOARCH=386 go test -tags=example ${{ !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
 
       - name: go test (Windows 386)
         if: ${{ startsWith(matrix.os, 'windows-') }}
         run: |
-          env GOARCH=386 go test -tags=example ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
+          env GOARCH=386 go test -tags=example ${{ !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
 
       - name: go test (Wasm)
         run: |
-          env GOOS=js GOARCH=wasm go test -tags=example ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
-          env GOOS=js GOARCH=wasm EBITENGINE_OPENGL=webgl1 go test -tags=example ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
+          env GOOS=js GOARCH=wasm go test -tags=example ${{ !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
+          env GOOS=js GOARCH=wasm EBITENGINE_OPENGL=webgl1 go test -tags=example ${{ !startsWith(matrix.go, '1.16.') && '-shuffle=on' || '' }} -v ./...
 
       - name: Install ebitenmobile
         run: |
           go install ./cmd/ebitenmobile
 
       - name: ebitenmobile bind (Android)
-        if: ${{ !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') }}
+        if: ${{ !startsWith(matrix.go, '1.16.') }}
         run: |
           cd /tmp/go-inovation
           ebitenmobile bind -target android -androidapi 19 -javapkg com.hajimehoshi.goinovation -o inovation.aar -v github.com/hajimehoshi/go-inovation/mobile
 
       - name: ebitenmobile bind (iOS)
-        if: ${{ startsWith(matrix.os, 'macos-') && !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') }}
+        if: ${{ startsWith(matrix.os, 'macos-') && !startsWith(matrix.go, '1.16.') }}
         run: |
           cd /tmp/go-inovation
           ebitenmobile bind -target ios -o Inovation.xcframework -v github.com/hajimehoshi/go-inovation/mobile
diff --git a/ebitenutil/fs_go116.go b/ebitenutil/fs.go
similarity index 97%
rename from ebitenutil/fs_go116.go
rename to ebitenutil/fs.go
index 08777b53c..ed8528a2e 100644
--- a/ebitenutil/fs_go116.go
+++ b/ebitenutil/fs.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-//go:build go1.16
-// +build go1.16
-
 package ebitenutil
 
 import (
diff --git a/go.mod b/go.mod
index f83f28654..cd789ef56 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hajimehoshi/ebiten/v2
 
-go 1.15
+go 1.16
 
 require (
 	github.com/ebitengine/purego v0.0.0-20220910041003-a51c01493ff9