diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 1802b057..acfa7736 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -49,7 +49,7 @@ bintray { name = "Mockito-Kotlin" desc = "Using Mockito with Kotlin" - licenses = ['Apache-2.0'] + licenses = ['MIT'] vcsUrl = 'https://github.com/bintray/gradle-bintray-plugin.git' version { diff --git a/mockito-kotlin/src/test/kotlin/AnyTest.kt b/mockito-kotlin/src/test/kotlin/AnyTest.kt index 85057ffd..d6839477 100644 --- a/mockito-kotlin/src/test/kotlin/AnyTest.kt +++ b/mockito-kotlin/src/test/kotlin/AnyTest.kt @@ -32,22 +32,6 @@ import org.junit.Before import org.junit.Test import org.mockito.Mockito -/* - * Copyright 2016 Niek Haarman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - class AnyTest { private lateinit var doAnswer: Fake diff --git a/mockito-kotlin/src/test/kotlin/EqTest.kt b/mockito-kotlin/src/test/kotlin/EqTest.kt index 16554dbb..dd107664 100644 --- a/mockito-kotlin/src/test/kotlin/EqTest.kt +++ b/mockito-kotlin/src/test/kotlin/EqTest.kt @@ -23,47 +23,6 @@ * THE SOFTWARE. */ -/* - * The MIT License - * - * Copyright (c) 2016 Niek Haarman - * Copyright (c) 2007 Mockito contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Copyright 2016 Niek Haarman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - import com.nhaarman.expect.expect import com.nhaarman.mockito_kotlin.eq import com.nhaarman.mockito_kotlin.mock diff --git a/mockito-kotlin/src/test/kotlin/MatcherTest.kt b/mockito-kotlin/src/test/kotlin/MatcherTest.kt index cb970c23..770c67f4 100644 --- a/mockito-kotlin/src/test/kotlin/MatcherTest.kt +++ b/mockito-kotlin/src/test/kotlin/MatcherTest.kt @@ -28,22 +28,6 @@ import com.nhaarman.mockito_kotlin.mock import com.nhaarman.mockito_kotlin.verify import org.junit.Test -/* - * Copyright 2016 Niek Haarman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - class MatcherTest { @Test diff --git a/mockito-kotlin/src/test/kotlin/MockTest.kt b/mockito-kotlin/src/test/kotlin/MockTest.kt index 6e5b74d1..0ba72853 100644 --- a/mockito-kotlin/src/test/kotlin/MockTest.kt +++ b/mockito-kotlin/src/test/kotlin/MockTest.kt @@ -28,22 +28,6 @@ import com.nhaarman.mockito_kotlin.mock import org.junit.Test import org.mockito.exceptions.base.MockitoException -/* - * Copyright 2016 Niek Haarman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - class MockTest { private lateinit var propertyInterfaceVariable: MyInterface diff --git a/mockito-kotlin/src/test/kotlin/SpyTest.kt b/mockito-kotlin/src/test/kotlin/SpyTest.kt index 04f64af7..e2cc487a 100644 --- a/mockito-kotlin/src/test/kotlin/SpyTest.kt +++ b/mockito-kotlin/src/test/kotlin/SpyTest.kt @@ -23,22 +23,6 @@ * THE SOFTWARE. */ -/* - * Copyright 2016 Niek Haarman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - import com.nhaarman.expect.expect import com.nhaarman.mockito_kotlin.spy import org.junit.Test