Added better way in gradle for provided scope and optional flag
upgraded gradle module files to new provided/optional usage