Bump Go to 1.18 (#29)

AlexeySoshin · Apr 13, 2022 · 95795b9 · 95795b9
1 parent f6fb69a
commit 95795b9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: go
 
 go_import_path: github.com/alexeysoshin/smali2java
 go:
- - "1.15"
+ - "1.18"
 install:
  - go install
 script:

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Why would you need it if there are tools like https://bytecodeviewer.com/? <br /
 * Allows you to use other command line tools on the output
 
 ## Prerequisites
-* Go 1.15+
+* Go 1.18+
 
 ## Building
 ```

diff --git a/go.mod b/go.mod
@@ -1,5 +1,11 @@
 module github.com/alexeysoshin/smali2java
 
-go 1.15
+go 1.18
 
 require github.com/stretchr/testify v1.4.0
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -5,6 +5,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/small2java_test.go b/small2java_test.go
@@ -7,20 +7,23 @@ import (
 
 func TestConvertSmali(t *testing.T) {
 	wg := &sync.WaitGroup{}
+	wg.Add(1)
 	convertSmali("./test_data/s.smali", wg)
 
 	wg.Wait()
 }
 
 func TestConvertSmali2(t *testing.T) {
 	wg := &sync.WaitGroup{}
+	wg.Add(1)
 	convertSmali("./test_data/o.smali", wg)
 
 	wg.Wait()
 }
 
 func TestConvertSmaliFC(t *testing.T) {
 	wg := &sync.WaitGroup{}
+	wg.Add(1)
 	convertSmali("./test_data/fc.smali", wg)
 
 	wg.Wait()