gradle設定修正
Merge branch 'master' into future