From e6744fa5a9e047d056765557c4aafc120393db26 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 10 Apr 2021 13:15:54 +0530
Subject: openpgp-ktx: relicence to Apache 2.0

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 openpgp-ktx/build.gradle.kts                                        | 2 +-
 openpgp-ktx/gradle.properties                                       | 6 +++---
 openpgp-ktx/src/main/AndroidManifest.xml                            | 2 +-
 .../src/main/aidl/org/openintents/openpgp/IOpenPgpService2.aidl     | 2 +-
 .../src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt    | 2 +-
 .../src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpApi.kt        | 2 +-
 .../java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt   | 2 +-
 .../src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt      | 2 +-
 .../java/me/msfjarvis/openpgpktx/util/ParcelFileDescriptorUtil.kt   | 2 +-
 .../main/java/org/openintents/openpgp/OpenPgpDecryptionResult.kt    | 2 +-
 openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpError.kt   | 2 +-
 .../src/main/java/org/openintents/openpgp/OpenPgpMetadata.kt        | 2 +-
 .../src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.kt | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openpgp-ktx/build.gradle.kts b/openpgp-ktx/build.gradle.kts
index c809466c..6f90e6c8 100644
--- a/openpgp-ktx/build.gradle.kts
+++ b/openpgp-ktx/build.gradle.kts
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 plugins {
diff --git a/openpgp-ktx/gradle.properties b/openpgp-ktx/gradle.properties
index 8e65a892..a5bab53f 100644
--- a/openpgp-ktx/gradle.properties
+++ b/openpgp-ktx/gradle.properties
@@ -1,6 +1,6 @@
 #
 # Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-# SPDX-License-Identifier: GPL-3.0-only
+# SPDX-License-Identifier: Apache-2.0
 #
 
 VERSION_NAME=2.2.0
@@ -14,8 +14,8 @@ POM_SCM_URL=https://github.com/Android-Password-Store/android-password-store
 POM_SCM_CONNECTION=scm:git:https://github.com/Android-Password-Store/android-password-store.git
 POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com:Android-Password-Store/android-password-store
 
-POM_LICENCE_NAME=LGPL-3.0-only WITH LGPL-3.0-linking-exception
-POM_LICENCE_URL=https://www.gnu.org/licenses/lgpl-3.0.txt
+POM_LICENCE_NAME=Apache-2.0
+POM_LICENCE_URL=https://opensource.org/licenses/Apache-2.0
 POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=android-password-store
diff --git a/openpgp-ktx/src/main/AndroidManifest.xml b/openpgp-ktx/src/main/AndroidManifest.xml
index d98d56fa..1e77bc4e 100644
--- a/openpgp-ktx/src/main/AndroidManifest.xml
+++ b/openpgp-ktx/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 
 <manifest package="me.msfjarvis.openpgpktx" />
diff --git a/openpgp-ktx/src/main/aidl/org/openintents/openpgp/IOpenPgpService2.aidl b/openpgp-ktx/src/main/aidl/org/openintents/openpgp/IOpenPgpService2.aidl
index 7e67986d..d5cf37db 100644
--- a/openpgp-ktx/src/main/aidl/org/openintents/openpgp/IOpenPgpService2.aidl
+++ b/openpgp-ktx/src/main/aidl/org/openintents/openpgp/IOpenPgpService2.aidl
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2019 The Android Password Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-Only
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.openintents.openpgp;
 
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
index e6a189b9..f81b72a4 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 package me.msfjarvis.openpgpktx
 
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpApi.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpApi.kt
index aa5a2f84..42ee94bb 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpApi.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpApi.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 @file:Suppress("Unused")
 
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt
index 6a0a9933..528c0127 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 package me.msfjarvis.openpgpktx.util
 
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
index f277615e..75acd692 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 package me.msfjarvis.openpgpktx.util
 
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/ParcelFileDescriptorUtil.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/ParcelFileDescriptorUtil.kt
index 26e04e97..dc3ef736 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/ParcelFileDescriptorUtil.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/ParcelFileDescriptorUtil.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 package me.msfjarvis.openpgpktx.util
 
diff --git a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpDecryptionResult.kt b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpDecryptionResult.kt
index 058afa42..18f8cd0c 100644
--- a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpDecryptionResult.kt
+++ b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpDecryptionResult.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 @file:JvmName("OpenPgpDecryptionResult")
 
diff --git a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpError.kt b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpError.kt
index fb1c9602..0756c023 100644
--- a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpError.kt
+++ b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpError.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 @file:JvmName("OpenPgpError")
 
diff --git a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpMetadata.kt b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpMetadata.kt
index b590456a..a73c77c1 100644
--- a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpMetadata.kt
+++ b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpMetadata.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 @file:JvmName("OpenPgpMetadata")
 
diff --git a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.kt b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.kt
index 3b7e6d1b..45f10abd 100644
--- a/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.kt
+++ b/openpgp-ktx/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: Apache-2.0
  */
 @file:JvmName("OpenPgpSignatureResult")
 
-- 
cgit v1.2.3