Merge branch 'master' of github.com:CopernicaMarketingSoftware/PHP-CPP

EmielBruijntjes · EmielBruijntjes · commit cd9919ead7f4 · 2019-04-19T17:44:47.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - nightly # doesn't work yet on PHP 7.3! not building.
+  - 7.3
+  - nightly # doesn't work yet on PHP 7.4! not building.
 
 
 # setting the env is the easiest, because it will mix with all the separate php versions (travis does this)
diff --git a/Makefile b/Makefile
@@ -49,8 +49,8 @@ INSTALL_LIB			=	${INSTALL_PREFIX}/lib
 #   Otherwise only release verions changes. (version is MAJOR.MINOR.RELEASE)
 #
 
-SONAME					=	2.1
-VERSION					=	2.1.4
+SONAME					=	2.2
+VERSION					=	2.2.0
 
 
 #

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ INSTALL_LIB = ${INSTALL_PREFIX}/lib`
`49`	`49`	`# Otherwise only release verions changes. (version is MAJOR.MINOR.RELEASE)`
`50`	`50`	`#`
`51`	`51`
`52`		`-SONAME = 2.1`
`53`		`-VERSION = 2.1.4`
	`52`	`+SONAME = 2.2`
	`53`	`+VERSION = 2.2.0`
`54`	`54`
`55`	`55`
`56`	`56`	`#`