Revert "Rolled back to 1.6 target and source level"

This reverts commit bb114e76085d057c3c77b8144edf0b5b606603a8.
Revert "Revert "use diamond operator where applicable""

This reverts commit a132c55f25b40801d6e7e7c48f162b892ea0aa54.