Who united all of ancient Greece?

The Greek city-states continued to fight each other under shifting alliances for a further sixty years, with first Sparta dominating, then Thebes. They were brought under control of Macedonia by its king Philip II.