simplify build.gradle file
Added flavored message wrapper