“I am happy to have resolved our differences with Disney,” Johansson said in a statement.

I look forward to continuing our collaboration in years to come."

Terms of the settlement weren’t revealed.

CNET’s Joan E. Solsman contributed to this report.