Skip to content

Commit

Permalink
This package will be developed for PHP 7.x only.
Browse files Browse the repository at this point in the history
  • Loading branch information
prwater committed Aug 2, 2017
1 parent 10ee938 commit 6198420
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 65 deletions.
1 change: 0 additions & 1 deletion .version

This file was deleted.

44 changes: 3 additions & 41 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,47 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Phing Extensions" default="build" basedir=".">
<taskdef name="ReadSemanticVersion" classname="src.Task.ReadSemanticVersionTask"/>
<property name="VERSION" value="0.0.0"/> <!-- Keep our IDE happy -->

<target name="build"/>

<!-- Merges the current branch with a remote branch -->
<target name="git-merge">
<exec command="git rev-parse --abbrev-ref HEAD" outputProperty="CURRENT_BRANCH"/>
<input message="Your current branch is '${CURRENT_BRANCH}'. Remote branch: " propertyName="BRANCH"/>
<gitbranch branchname="temp" repository="."/>
<gitcheckout repository="." branchname="temp"/>
<gitpull repository="." refspec="${BRANCH}" quiet="false"/>
<gitcheckout repository="." branchname="${CURRENT_BRANCH}"/>
<gitmerge repository="." remote="temp"/>
<gitbranch branchname="temp" repository="." delete="true"/>
</target>

<!-- Merges the current branch with a remote branch in two steps: step 1 -->
<target name="git-merge1">
<exec command="git rev-parse --abbrev-ref HEAD" outputProperty="CURRENT_BRANCH" checkreturn="true"/>
<exec command="git fetch -p" passthru="true" checkreturn="true"/>
<input message="Your current branch is '${CURRENT_BRANCH}'. Remote branch: " propertyName="BRANCH"/>
<gitbranch branchname="temp" repository="."/>
<gitcheckout repository="." branchname="temp"/>
<gitpull repository="." refspec="${BRANCH}" quiet="false"/>
</target>

<!-- Merges the current branch with a remote branch in two steps: step 2 -->
<target name="git-merge2">
<exec command="git rev-parse --abbrev-ref HEAD" outputProperty="CURRENT_BRANCH" checkreturn="true"/>
<input message="Your current branch is '${CURRENT_BRANCH}'. Branch: " propertyName="BRANCH"/>
<gitcheckout repository="." branchname="${BRANCH}"/>
<gitmerge repository="." remote="temp"/>
<gitbranch branchname="temp" repository="." delete="true"/>
</target>

<target name="version">
<ReadSemanticVersion file=".version" versionProperty="VERSION"/>
<echo message="${VERSION}"/>
<gitcommit repository="." message="Release: ${VERSION}" allFiles="true"/>
<gitpush repository="."/>
<gittag repository="." name="${VERSION}"/>
<gitpush repository="." refspec="${VERSION}" quiet="false"/>
<!-- Run composer update -->
<target name="update">
<exec command="composer update" checkreturn="true" passthru="true"/>
</target>
</project>
25 changes: 2 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,9 @@
"type": "library",
"keyword": ["Phing", "Extensions"],
"license": "MIT",
"authors": [
{
"name": "Set Based IT Consultancy",
"email": "info@setbased.nl",
"homepage": "http://www.setbased.nl"
},
{
"name": "Paul Water",
"email": "p.r.water@setbased.nl",
"homepage": "http://www.setbased.nl",
"role": "Architect"
},
{
"name": "Dima Nagorniy",
"role": "Developer"
},
{
"name": "Valery Zuban",
"role": "Developer"
}
],
"require": {
"php": ">=5.4.0",
"phing/phing": "2.*"
"php": ">=7.0.0",
"phing/phing": "^2.0.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 6198420

Please sign in to comment.