gradle upgrade and fix of build file