follow the deprecation advice and use the replacement classes to get rid of some deprecation warnings in the build log

follow the deprecation advice and use the replacement classes to get rid of some deprecation warnings in the build log #1553