From c03a115b84dbbbe198bfb662fc02f63c289dfdfb Mon Sep 17 00:00:00 2001 From: TM Date: Sun, 28 Jun 2026 18:00:37 -0700 Subject: [PATCH 1/2] Added Apache 2.0 license to missing source files Four Kotlin files were missing the Apache 2.0 license header that every other source file carries. - Added the header to FruittieScreen, FruittieViewModel, ViewModelFactory and ViewModelStoreUtil. --- .../fruitties/android/ui/FruittieScreen.kt | 15 +++++++++++++++ .../fruitties/viewmodel/FruittieViewModel.kt | 15 +++++++++++++++ .../fruitties/viewmodel/ViewModelFactory.kt | 15 +++++++++++++++ .../fruitties/di/viewmodel/ViewModelStoreUtil.kt | 15 +++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt index 6a28891..11e7494 100644 --- a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt +++ b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * 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 + * + * https://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. + */ package com.example.fruitties.android.ui import androidx.compose.foundation.layout.Column diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt index 032d199..6a33c4c 100644 --- a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt +++ b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * 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 + * + * https://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. + */ package com.example.fruitties.viewmodel import androidx.lifecycle.ViewModel diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt index a7abd17..9b1a0a4 100644 --- a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt +++ b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * 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 + * + * https://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. + */ package com.example.fruitties.viewmodel import androidx.lifecycle.viewmodel.MutableCreationExtras diff --git a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt index 0acafb9..308d218 100644 --- a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt +++ b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * 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 + * + * https://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. + */ package com.example.fruitties.di.viewmodel import androidx.lifecycle.ViewModel From 40578911bdfeb4e07fa8a88f842ad2f63ca8424b Mon Sep 17 00:00:00 2001 From: TM Date: Sun, 28 Jun 2026 18:15:18 -0700 Subject: [PATCH 2/2] Copyright Year --- .../java/com/example/fruitties/android/ui/FruittieScreen.kt | 2 +- .../kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt | 2 +- .../kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt | 2 +- .../com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt index 11e7494..d7fc7b7 100644 --- a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt +++ b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 The Android Open Source Project + * Copyright 2026 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt index 6a33c4c..08fc5a4 100644 --- a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt +++ b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 The Android Open Source Project + * Copyright 2026 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt index 9b1a0a4..125c957 100644 --- a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt +++ b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 The Android Open Source Project + * Copyright 2026 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt index 308d218..6da6ea5 100644 --- a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt +++ b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 The Android Open Source Project + * Copyright 2026 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.