Clean plugin upgrade

2.4.1 -> 2.6.1
Compiler plugin upgrade

2.3.2 -> 3.2