diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 1e59305..b250e56 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -2,7 +2,7 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/README.md b/README.md index e61f378..aedd47e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,19 @@ -# Ackee Security +# Ackee Guardian [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE) -[![Maven Central](https://img.shields.io/maven-central/v/io.github.ackeecz/security-bom)](https://central.sonatype.com/artifact/io.github.ackeecz/security-bom) +[![Maven Central](https://img.shields.io/maven-central/v/io.github.ackeecz/guardian-bom)](https://central.sonatype.com/artifact/io.github.ackeecz/guardian-bom) ## Overview -Ackee Security is a library focusing on a security-related logic. In [Ackee](https://www.ackee.cz/) -we mainly use it to share some common security-related implementations across our projects, but it +The galaxy has the Guardians of the Galaxy to fend off galactic threats and save us from cosmic chaos. +But who’s watching over your apps, shielding them from malicious attackers and software mischief? + +Enter **Ackee Guardian** – your app's fearless defender, standing strong against the dark forces of bugs, +vulnerabilities, and threats. Just as the Guardians of the Galaxy protect the universe, Ackee Guardian +ensures your Android app stays secure and your users stay safe. + +Ackee Guardian focuses on a security-related logic. In [Ackee](https://www.ackee.cz/) +we use it to share some common security implementations across our projects, but it contains useful logic suited for anyone's needs. More specifically, you can use it as a 100% compatible replacement for [Jetpack Security Crypto](https://developer.android.com/reference/kotlin/androidx/security/crypto/package-summary) library and there is more! @@ -21,7 +28,7 @@ Library consists of several modules: ### Core -Contains basic core security-related logic like `MasterKey` class (rewritten from Jetpack Security) +Contains basic core security logic like `MasterKey` class (rewritten from Jetpack Security) that is used by other modules to encrypt the data. You don't have to depend on this module directly, if you use `datastore` modules or `jetpack`. @@ -98,9 +105,9 @@ pairs that made unnecessary extra encryptions/decryptions under the hood. used in Jetpack Security, that also had some synchronization issues, that were fixed in later releases. - Since one of the major issues of Jetpack Security was an outdated Tink library, which makes all the crypto operations and Jetpack Security was basically just a thin abstraction over it, we wanted to -try to prevent the same issues in the future and so we decided to force clients of Ackee Security library +try to prevent the same issues in the future and so we decided to force clients of Ackee Guardian library to depend on Tink explicitly. This allows clients to have a better control over updates, independent -of Ackee Security updates. +of Ackee Guardian updates. - Fix several bugs discovered in `EncryptedSharedPreferences` during covering the logic by tests: - If you saved empty string `Set`, you didn't get it back by using `getStringSet`, but you got default value passed in parameter instead. @@ -120,22 +127,22 @@ of Ackee Security updates. Add the following dependencies to your `libs.versions.toml`, depending on what you need. You should always use BOM to be sure to get binary compatible dependencies. If you need only `jetpack` features, -just declare BOM and `io.github.ackeecz:security-jetpack`. If you need only particular DataStore, -then declare BOM and particular DataStore dependency, e.g. `io.github.ackeecz:security-datastore`. -You don't need to declare `io.github.ackeecz:security-core` dependency, unless you depend only on +just declare BOM and `io.github.ackeecz:guardian-jetpack`. If you need only particular DataStore, +then declare BOM and particular DataStore dependency, e.g. `io.github.ackeecz:guardian-datastore`. +You don't need to declare `io.github.ackeecz:guardian-core` dependency, unless you depend only on `core` without any DataStore or `jetpack` modules. ```toml [versions] -ackee-security-bom = "SPECIFY_VERSION" +ackee-guardian-bom = "SPECIFY_VERSION" tink = "SPECIFY_VERSION" [libraries] -ackee-security-bom = { module = "io.github.ackeecz:security-bom", version.ref = "ackee-security-bom" } -ackee-security-core = { module = "io.github.ackeecz:security-core" } -ackee-security-datastore = { module = "io.github.ackeecz:security-datastore" } -ackee-security-datastore-preferences = { module = "io.github.ackeecz:security-datastore-preferences" } -ackee-security-jetpack = { module = "io.github.ackeecz:security-jetpack" } +ackee-guardian-bom = { module = "io.github.ackeecz:guardian-bom", version.ref = "ackee-guardian-bom" } +ackee-guardian-core = { module = "io.github.ackeecz:guardian-core" } +ackee-guardian-datastore = { module = "io.github.ackeecz:guardian-datastore" } +ackee-guardian-datastore-preferences = { module = "io.github.ackeecz:guardian-datastore-preferences" } +ackee-guardian-jetpack = { module = "io.github.ackeecz:guardian-jetpack" } tink-android = { module = "com.google.crypto.tink:tink-android", version.ref = "tink" } ``` @@ -146,20 +153,20 @@ Then specify dependencies in your `build.gradle.kts`: dependencies { // Always use BOM - implementation(platform(libs.ackee.security.bom)) + implementation(platform(libs.ackee.guardian.bom)) // Optional core dependency. Needed to be specified only if you do not use any other artifact // and want to use core in your app. - implementation(libs.ackee.security.core) + implementation(libs.ackee.guardian.core) // For encrypted DataStore - implementation(libs.ackee.security.datastore) + implementation(libs.ackee.guardian.datastore) // For encrypted preferences DataStore - implementation(libs.ackee.security.datastore.preferences) + implementation(libs.ackee.guardian.datastore.preferences) // For Jetpack Security port - implementation(libs.ackee.security.jetpack) + implementation(libs.ackee.guardian.jetpack) - // Dependency on Tink must be included explicitly. This allows clients of Ackee Security library + // Dependency on Tink must be included explicitly. This allows clients of Ackee Guardian library // to control the version of Tink themselves, being able to keep it up-to-date as much as possible - // and not depend on Ackee Security releases. + // and not depend on Ackee Guardian releases. implementation(libs.tink.android) } ``` diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 18fe9ca..bb54624 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,17 +1,17 @@ -import io.github.ackeecz.security.properties.LibraryProperties +import io.github.ackeecz.guardian.properties.LibraryProperties plugins { - alias(libs.plugins.ackeecz.security.android.application) - alias(libs.plugins.ackeecz.security.testing) - alias(libs.plugins.ackeecz.security.testing.android) - alias(libs.plugins.ackeecz.security.testing.protobuf) + alias(libs.plugins.ackeecz.guardian.android.application) + alias(libs.plugins.ackeecz.guardian.testing) + alias(libs.plugins.ackeecz.guardian.testing.android) + alias(libs.plugins.ackeecz.guardian.testing.protobuf) } android { - namespace = "io.github.ackeecz.security.sample" + namespace = "io.github.ackeecz.guardian.sample" defaultConfig { - applicationId = "io.github.ackeecz.security" + applicationId = "io.github.ackeecz.guardian" } } @@ -19,15 +19,15 @@ android { dependencies { val bomVersion = LibraryProperties(project).bomArtifactProperties.version - implementation(platform("io.github.ackeecz:security-bom:$bomVersion")) - implementation("io.github.ackeecz:security-core") - implementation("io.github.ackeecz:security-datastore") - implementation("io.github.ackeecz:security-datastore-preferences") - implementation("io.github.ackeecz:security-jetpack") + implementation(platform("io.github.ackeecz:guardian-bom:$bomVersion")) + implementation("io.github.ackeecz:guardian-core") + implementation("io.github.ackeecz:guardian-datastore") + implementation("io.github.ackeecz:guardian-datastore-preferences") + implementation("io.github.ackeecz:guardian-jetpack") // Dependency on Tink must be included explicitly and should be even with explicit version. This - // allows clients of Ackee Security library to control the version of Tink themselves, being - // able to keep it up-to-date as much as possible and not depend on Ackee Security releases. + // allows clients of Ackee Guardian library to control the version of Tink themselves, being + // able to keep it up-to-date as much as possible and not depend on Ackee Guardian releases. implementation(libs.tink.android) testImplementation(libs.bouncyCastle.bcpkix) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index abf77bf..9b0c798 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Ackee Security - \ No newline at end of file + Ackee Guardian + diff --git a/app/src/test/java/io/github/ackeecz/security/sample/AndroidTestWithKeyStore.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/AndroidTestWithKeyStore.kt similarity index 88% rename from app/src/test/java/io/github/ackeecz/security/sample/AndroidTestWithKeyStore.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/AndroidTestWithKeyStore.kt index ad9f528..ad45906 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/AndroidTestWithKeyStore.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/AndroidTestWithKeyStore.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.sample +package io.github.ackeecz.guardian.sample import android.os.Build import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.github.ackeecz.security.sample.junit.rule.AndroidFakeKeyStoreRule +import io.github.ackeecz.guardian.sample.junit.rule.AndroidFakeKeyStoreRule import org.junit.Rule import org.junit.runner.RunWith import org.robolectric.annotation.Config diff --git a/app/src/test/java/io/github/ackeecz/security/sample/CoreArtifactTest.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/CoreArtifactTest.kt similarity index 70% rename from app/src/test/java/io/github/ackeecz/security/sample/CoreArtifactTest.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/CoreArtifactTest.kt index 9c2ab22..46c4997 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/CoreArtifactTest.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/CoreArtifactTest.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.sample +package io.github.ackeecz.guardian.sample -import io.github.ackeecz.security.core.MasterKey +import io.github.ackeecz.guardian.core.MasterKey import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/app/src/test/java/io/github/ackeecz/security/sample/DataStoreArtifactTest.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/DataStoreArtifactTest.kt similarity index 88% rename from app/src/test/java/io/github/ackeecz/security/sample/DataStoreArtifactTest.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/DataStoreArtifactTest.kt index b5686d5..ba7fdca 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/DataStoreArtifactTest.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/DataStoreArtifactTest.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.sample +package io.github.ackeecz.guardian.sample import android.content.Context import androidx.datastore.core.CorruptionException @@ -8,11 +8,11 @@ import androidx.datastore.core.Serializer import androidx.datastore.dataStoreFile import androidx.test.core.app.ApplicationProvider import com.google.protobuf.InvalidProtocolBufferException -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.DataStoreEncryptionScheme -import io.github.ackeecz.security.datastore.createEncrypted -import io.github.ackeecz.security.datastore.encryptedDataStore +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.DataStoreEncryptionScheme +import io.github.ackeecz.guardian.datastore.createEncrypted +import io.github.ackeecz.guardian.datastore.encryptedDataStore import io.kotest.matchers.shouldBe import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/io/github/ackeecz/security/sample/DataStorePreferencesArtifactTest.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/DataStorePreferencesArtifactTest.kt similarity index 86% rename from app/src/test/java/io/github/ackeecz/security/sample/DataStorePreferencesArtifactTest.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/DataStorePreferencesArtifactTest.kt index c6ac3e2..34e8e66 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/DataStorePreferencesArtifactTest.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/DataStorePreferencesArtifactTest.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.sample +package io.github.ackeecz.guardian.sample import android.content.Context import androidx.datastore.core.DataStore @@ -9,11 +9,11 @@ import androidx.datastore.preferences.core.preferencesOf import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStoreFile import androidx.test.core.app.ApplicationProvider -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.DataStoreEncryptionScheme -import io.github.ackeecz.security.datastore.preferences.createEncrypted -import io.github.ackeecz.security.datastore.preferences.encryptedPreferencesDataStore +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.DataStoreEncryptionScheme +import io.github.ackeecz.guardian.datastore.preferences.createEncrypted +import io.github.ackeecz.guardian.datastore.preferences.encryptedPreferencesDataStore import io.kotest.matchers.shouldBe import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/io/github/ackeecz/security/sample/JetpackArtifactTest.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/JetpackArtifactTest.kt similarity index 91% rename from app/src/test/java/io/github/ackeecz/security/sample/JetpackArtifactTest.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/JetpackArtifactTest.kt index 8f51011..14c9a6d 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/JetpackArtifactTest.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/JetpackArtifactTest.kt @@ -1,13 +1,13 @@ -package io.github.ackeecz.security.sample +package io.github.ackeecz.guardian.sample import android.content.Context import android.content.SharedPreferences import androidx.test.core.app.ApplicationProvider -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.jetpack.EncryptedFile -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences -import io.github.ackeecz.security.jetpack.adaptToSharedPreferences -import io.github.ackeecz.security.sample.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.jetpack.EncryptedFile +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.adaptToSharedPreferences +import io.github.ackeecz.guardian.sample.junit.rule.CoroutineRule import io.kotest.matchers.maps.shouldHaveSize import io.kotest.matchers.shouldBe import kotlinx.coroutines.test.UnconfinedTestDispatcher diff --git a/app/src/test/java/io/github/ackeecz/security/sample/junit/rule/AndroidFakeKeyStoreRule.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/AndroidFakeKeyStoreRule.kt similarity index 99% rename from app/src/test/java/io/github/ackeecz/security/sample/junit/rule/AndroidFakeKeyStoreRule.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/AndroidFakeKeyStoreRule.kt index e1853cc..b73c0cd 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/junit/rule/AndroidFakeKeyStoreRule.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/AndroidFakeKeyStoreRule.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.sample.junit.rule +package io.github.ackeecz.guardian.sample.junit.rule import android.security.keystore.KeyGenParameterSpec import org.bouncycastle.asn1.x500.X500Name diff --git a/app/src/test/java/io/github/ackeecz/security/sample/junit/rule/CoroutineRule.kt b/app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/CoroutineRule.kt similarity index 92% rename from app/src/test/java/io/github/ackeecz/security/sample/junit/rule/CoroutineRule.kt rename to app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/CoroutineRule.kt index d28cad2..eb6f35a 100644 --- a/app/src/test/java/io/github/ackeecz/security/sample/junit/rule/CoroutineRule.kt +++ b/app/src/test/java/io/github/ackeecz/guardian/sample/junit/rule/CoroutineRule.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.sample.junit.rule +package io.github.ackeecz.guardian.sample.junit.rule import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.test.StandardTestDispatcher diff --git a/app/src/test/proto/test_data.proto b/app/src/test/proto/test_data.proto index 86a31b3..7a2bffb 100644 --- a/app/src/test/proto/test_data.proto +++ b/app/src/test/proto/test_data.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "io.github.ackeecz.security.sample"; +option java_package = "io.github.ackeecz.guardian.sample"; option java_multiple_files = true; message TestData { diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 6247a6b..9995d64 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -1,8 +1,8 @@ -import io.github.ackeecz.security.verification.task.VerifyBomVersionTask +import io.github.ackeecz.guardian.verification.task.VerifyBomVersionTask plugins { `java-platform` - alias(libs.plugins.ackeecz.security.publishing) + alias(libs.plugins.ackeecz.guardian.publishing) } dependencies { diff --git a/build-logic/logic/build.gradle.kts b/build-logic/logic/build.gradle.kts index 5ccbf20..f40b981 100644 --- a/build-logic/logic/build.gradle.kts +++ b/build-logic/logic/build.gradle.kts @@ -36,47 +36,47 @@ dependencies { gradlePlugin { plugins { plugin( - dependency = libs.plugins.ackeecz.security.android.application, + dependency = libs.plugins.ackeecz.guardian.android.application, pluginClassSimpleName = "AndroidApplicationPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.android.library, + dependency = libs.plugins.ackeecz.guardian.android.library, pluginClassSimpleName = "AndroidLibraryPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.preflightchecks, + dependency = libs.plugins.ackeecz.guardian.preflightchecks, pluginClassSimpleName = "RegisterPreflightChecksPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.publishing, + dependency = libs.plugins.ackeecz.guardian.publishing, pluginClassSimpleName = "PublishingPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.testfixtures, + dependency = libs.plugins.ackeecz.guardian.testfixtures, pluginClassSimpleName = "TestFixturesPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.testing.asProvider(), + dependency = libs.plugins.ackeecz.guardian.testing.asProvider(), pluginClassSimpleName = "TestingPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.testing.android, + dependency = libs.plugins.ackeecz.guardian.testing.android, pluginClassSimpleName = "TestingAndroidPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.testing.protobuf, + dependency = libs.plugins.ackeecz.guardian.testing.protobuf, pluginClassSimpleName = "TestingProtobufPlugin", ) plugin( - dependency = libs.plugins.ackeecz.security.tink, + dependency = libs.plugins.ackeecz.guardian.tink, pluginClassSimpleName = "TinkPlugin", ) } @@ -89,6 +89,6 @@ private fun NamedDomainObjectContainer.plugin( val pluginId = dependency.get().pluginId register(pluginId) { id = pluginId - implementationClass = "io.github.ackeecz.security.plugin.$pluginClassSimpleName" + implementationClass = "io.github.ackeecz.guardian.plugin.$pluginClassSimpleName" } } diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidApplicationPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidApplicationPlugin.kt similarity index 91% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidApplicationPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidApplicationPlugin.kt index c1dcdde..2f30662 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidApplicationPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidApplicationPlugin.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin -import io.github.ackeecz.security.util.Constants +import io.github.ackeecz.guardian.util.Constants import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidLibraryPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidLibraryPlugin.kt similarity index 95% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidLibraryPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidLibraryPlugin.kt index 86b2972..43b0e9d 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidLibraryPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidLibraryPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidPlugin.kt similarity index 89% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidPlugin.kt index 024ad3a..8e01541 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/AndroidPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/AndroidPlugin.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.android.build.gradle.BaseExtension -import io.github.ackeecz.security.util.Constants +import io.github.ackeecz.guardian.util.Constants import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/DetektPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/DetektPlugin.kt similarity index 96% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/DetektPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/DetektPlugin.kt index 998eae3..38f9dbf 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/DetektPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/DetektPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import io.gitlab.arturbosch.detekt.extensions.DetektExtension import org.gradle.api.Plugin diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/KotlinPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/KotlinPlugin.kt similarity index 90% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/KotlinPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/KotlinPlugin.kt index 20615f8..6685b4c 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/KotlinPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/KotlinPlugin.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin -import io.github.ackeecz.security.util.Constants +import io.github.ackeecz.guardian.util.Constants import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.withType diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/PublishingPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/PublishingPlugin.kt similarity index 93% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/PublishingPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/PublishingPlugin.kt index e07bc44..e40f544 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/PublishingPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/PublishingPlugin.kt @@ -1,11 +1,11 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.vanniktech.maven.publish.MavenPublishBaseExtension import com.vanniktech.maven.publish.SonatypeHost -import io.github.ackeecz.security.properties.LibraryProperties -import io.github.ackeecz.security.util.PublishableProject -import io.github.ackeecz.security.verification.task.CheckIfUpdateNeededSinceCurrentTagTask -import io.github.ackeecz.security.verification.task.VerifyPublishingTask +import io.github.ackeecz.guardian.properties.LibraryProperties +import io.github.ackeecz.guardian.util.PublishableProject +import io.github.ackeecz.guardian.verification.task.CheckIfUpdateNeededSinceCurrentTagTask +import io.github.ackeecz.guardian.verification.task.VerifyPublishingTask import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.UnknownConfigurationException diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/RegisterPreflightChecksPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/RegisterPreflightChecksPlugin.kt similarity index 95% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/RegisterPreflightChecksPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/RegisterPreflightChecksPlugin.kt index c1bb5cd..08dd0e9 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/RegisterPreflightChecksPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/RegisterPreflightChecksPlugin.kt @@ -1,9 +1,9 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin -import io.github.ackeecz.security.util.Constants -import io.github.ackeecz.security.util.ExecuteCommand -import io.github.ackeecz.security.verification.task.VerifyBomVersionTask -import io.github.ackeecz.security.verification.task.VerifyPublishingTask +import io.github.ackeecz.guardian.util.Constants +import io.github.ackeecz.guardian.util.ExecuteCommand +import io.github.ackeecz.guardian.verification.task.VerifyBomVersionTask +import io.github.ackeecz.guardian.verification.task.VerifyPublishingTask import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestFixturesPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestFixturesPlugin.kt similarity index 93% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestFixturesPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestFixturesPlugin.kt index c3745e1..be654f8 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestFixturesPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestFixturesPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingAndroidPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingAndroidPlugin.kt similarity index 95% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingAndroidPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingAndroidPlugin.kt index 73fe0e9..39d3e52 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingAndroidPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingAndroidPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.android.build.gradle.BaseExtension import org.gradle.api.Plugin diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingPlugin.kt similarity index 97% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingPlugin.kt index bbcee36..7da3d4e 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.android.build.gradle.BaseExtension import org.gradle.api.Plugin diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingProtobufPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingProtobufPlugin.kt similarity index 97% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingProtobufPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingProtobufPlugin.kt index c91d60e..e14dba4 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TestingProtobufPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TestingProtobufPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.google.protobuf.gradle.ProtobufExtension import org.gradle.api.Plugin diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TinkPlugin.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TinkPlugin.kt similarity index 89% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TinkPlugin.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TinkPlugin.kt index e944095..ecabae7 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/TinkPlugin.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/TinkPlugin.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/Utils.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/Utils.kt similarity index 98% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/Utils.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/Utils.kt index d0fae1e..d833ee4 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/plugin/Utils.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/plugin/Utils.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.plugin +package io.github.ackeecz.guardian.plugin import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.CommonExtension diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/ArtifactProperties.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/ArtifactProperties.kt similarity index 97% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/ArtifactProperties.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/ArtifactProperties.kt index ba50840..15c7d4f 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/ArtifactProperties.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/ArtifactProperties.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.properties +package io.github.ackeecz.guardian.properties -import io.github.ackeecz.security.util.PublishableProject +import io.github.ackeecz.guardian.util.PublishableProject import java.util.Properties public sealed class ArtifactProperties( diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/LibraryProperties.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/LibraryProperties.kt similarity index 94% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/LibraryProperties.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/LibraryProperties.kt index 86d2b5a..1ecea7f 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/properties/LibraryProperties.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/properties/LibraryProperties.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.properties +package io.github.ackeecz.guardian.properties -import io.github.ackeecz.security.util.PublishableProject +import io.github.ackeecz.guardian.util.PublishableProject import org.gradle.api.Project import java.io.File import java.util.Properties diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Constants.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Constants.kt similarity index 91% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Constants.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Constants.kt index 6b1ab5a..8942243 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Constants.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Constants.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util import org.gradle.api.JavaVersion import org.jetbrains.kotlin.gradle.dsl.JvmTarget diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/ExecuteCommand.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/ExecuteCommand.kt similarity index 97% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/ExecuteCommand.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/ExecuteCommand.kt index 5eeeb5d..e63fe7b 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/ExecuteCommand.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/ExecuteCommand.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util import org.gradle.api.Project import java.io.ByteArrayOutputStream diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/PublishableProject.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/PublishableProject.kt similarity index 96% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/PublishableProject.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/PublishableProject.kt index 1232d26..f9067c3 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/PublishableProject.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/PublishableProject.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util internal sealed interface PublishableProject { diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Utils.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Utils.kt similarity index 89% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Utils.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Utils.kt index 544be13..0df5f76 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/util/Utils.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/util/Utils.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util import org.gradle.api.Task diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatus.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatus.kt similarity index 94% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatus.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatus.kt index ddf55df..89129c9 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatus.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatus.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.util.ExecuteCommand +import io.github.ackeecz.guardian.util.ExecuteCommand import org.gradle.api.GradleException import org.gradle.api.Project import org.jetbrains.annotations.VisibleForTesting diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTag.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTag.kt similarity index 96% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTag.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTag.kt index fe0a9ef..ee02d22 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTag.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTag.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.properties.LibraryProperties -import io.github.ackeecz.security.util.ExecuteCommand +import io.github.ackeecz.guardian.properties.LibraryProperties +import io.github.ackeecz.guardian.util.ExecuteCommand import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.internal.cc.base.logger diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjects.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjects.kt similarity index 97% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjects.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjects.kt index 2f332bb..b8c9801 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjects.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjects.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project import org.gradle.api.artifacts.Configuration diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetTag.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetTag.kt similarity index 96% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetTag.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetTag.kt index 5687dd8..2cde287 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/GetTag.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/GetTag.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.util.ExecuteCommand -import io.github.ackeecz.security.verification.GetTag.Companion.BOM_VERSION_TAG_PREFIX +import io.github.ackeecz.guardian.util.ExecuteCommand +import io.github.ackeecz.guardian.verification.GetTag.Companion.BOM_VERSION_TAG_PREFIX import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.internal.cc.base.logger diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyBomVersion.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersion.kt similarity index 98% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyBomVersion.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersion.kt index d820efb..62ca9d0 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyBomVersion.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersion.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project import org.jetbrains.annotations.VisibleForTesting diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyPublishing.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishing.kt similarity index 98% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyPublishing.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishing.kt index ecb6365..781807e 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/VerifyPublishing.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishing.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.util.PublishableProject +import io.github.ackeecz.guardian.util.PublishableProject import org.gradle.api.Project import org.jetbrains.annotations.VisibleForTesting diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt similarity index 87% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt index 6568d67..d113d99 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/CheckIfUpdateNeededSinceCurrentTagTask.kt @@ -1,10 +1,10 @@ -package io.github.ackeecz.security.verification.task +package io.github.ackeecz.guardian.verification.task -import io.github.ackeecz.security.util.Constants -import io.github.ackeecz.security.util.getTaskName -import io.github.ackeecz.security.verification.ArtifactUpdateStatus -import io.github.ackeecz.security.verification.CheckArtifactUpdateStatus -import io.github.ackeecz.security.verification.GetCurrentTag +import io.github.ackeecz.guardian.util.Constants +import io.github.ackeecz.guardian.util.getTaskName +import io.github.ackeecz.guardian.verification.ArtifactUpdateStatus +import io.github.ackeecz.guardian.verification.CheckArtifactUpdateStatus +import io.github.ackeecz.guardian.verification.GetCurrentTag import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyBomVersionTask.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyBomVersionTask.kt similarity index 83% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyBomVersionTask.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyBomVersionTask.kt index 35f7f62..ea0e902 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyBomVersionTask.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyBomVersionTask.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.verification.task +package io.github.ackeecz.guardian.verification.task -import io.github.ackeecz.security.util.Constants -import io.github.ackeecz.security.util.getTaskName -import io.github.ackeecz.security.verification.VerifyBomVersion +import io.github.ackeecz.guardian.util.Constants +import io.github.ackeecz.guardian.util.getTaskName +import io.github.ackeecz.guardian.verification.VerifyBomVersion import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.Project diff --git a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyPublishingTask.kt b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyPublishingTask.kt similarity index 84% rename from build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyPublishingTask.kt rename to build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyPublishingTask.kt index 21b7e4b..f7b61a2 100644 --- a/build-logic/logic/src/main/kotlin/io/github/ackeecz/security/verification/task/VerifyPublishingTask.kt +++ b/build-logic/logic/src/main/kotlin/io/github/ackeecz/guardian/verification/task/VerifyPublishingTask.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.verification.task +package io.github.ackeecz.guardian.verification.task -import io.github.ackeecz.security.util.Constants -import io.github.ackeecz.security.util.getTaskName -import io.github.ackeecz.security.verification.VerifyPublishing +import io.github.ackeecz.guardian.util.Constants +import io.github.ackeecz.guardian.util.getTaskName +import io.github.ackeecz.guardian.verification.VerifyPublishing import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/testutil/ProjectUtils.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/testutil/ProjectUtils.kt similarity index 91% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/testutil/ProjectUtils.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/testutil/ProjectUtils.kt index 8e2b089..525d260 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/testutil/ProjectUtils.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/testutil/ProjectUtils.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.testutil +package io.github.ackeecz.guardian.testutil -import io.github.ackeecz.security.verification.ArtifactVersion +import io.github.ackeecz.guardian.verification.ArtifactVersion import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies import org.gradle.testfixtures.ProjectBuilder diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandStub.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandStub.kt similarity index 95% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandStub.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandStub.kt index 6f1cc55..0d71351 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandStub.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandStub.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandTest.kt similarity index 97% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandTest.kt index af90fc2..69aa1f5 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/ExecuteCommandTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/ExecuteCommandTest.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/Factories.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/Factories.kt similarity index 85% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/Factories.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/Factories.kt index 48f662e..f15e34f 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/util/Factories.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/util/Factories.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.util +package io.github.ackeecz.guardian.util internal fun createErrorExecuteCommandResult( commandOutput: String = "", diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusStub.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusStub.kt similarity index 90% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusStub.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusStub.kt index 0edea29..386dc19 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusStub.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusStub.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusTest.kt similarity index 92% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusTest.kt index 47bec08..77706a2 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/CheckArtifactUpdateStatusTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/CheckArtifactUpdateStatusTest.kt @@ -1,9 +1,9 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.buildProject -import io.github.ackeecz.security.util.ExecuteCommand -import io.github.ackeecz.security.util.ExecuteCommandStub -import io.github.ackeecz.security.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX +import io.github.ackeecz.guardian.testutil.buildProject +import io.github.ackeecz.guardian.util.ExecuteCommand +import io.github.ackeecz.guardian.util.ExecuteCommandStub +import io.github.ackeecz.guardian.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagStub.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagStub.kt similarity index 92% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagStub.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagStub.kt index 6b07992..3e68e56 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagStub.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagStub.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagTest.kt similarity index 89% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagTest.kt index 2d4b2b3..7510407 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetArtifactVersionFromTagTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetArtifactVersionFromTagTest.kt @@ -1,10 +1,10 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.buildProject -import io.github.ackeecz.security.util.ExecuteCommand -import io.github.ackeecz.security.util.ExecuteCommandStub -import io.github.ackeecz.security.util.createErrorExecuteCommandResult -import io.github.ackeecz.security.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX +import io.github.ackeecz.guardian.testutil.buildProject +import io.github.ackeecz.guardian.util.ExecuteCommand +import io.github.ackeecz.guardian.util.ExecuteCommandStub +import io.github.ackeecz.guardian.util.createErrorExecuteCommandResult +import io.github.ackeecz.guardian.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.nulls.shouldBeNull @@ -22,21 +22,21 @@ private const val NOT_INITIAL_VERSION = "1.0.1" private const val PROPERTIES_FILE_CONTENT = """ GROUP_ID=io.github.ackeecz - POM_URL=https://github.com/AckeeCZ/ackee-android-security + POM_URL=https://github.com/AckeeCZ/ackee-guardian POM_DEVELOPER_ID=ackee POM_DEVELOPER_NAME=Ackee POM_DEVELOPER_EMAIL=info@ackee.cz POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt - POM_SCM_CONNECTION=scm:git:github.com/AckeeCZ/ackee-android-security.git - POM_SCM_DEVELOPER_CONNECTION=scm:git:ssh://github.com/AckeeCZ/ackee-android-security.git - POM_SCM_URL=https://github.com/AckeeCZ/ackee-android-security/tree/main + POM_SCM_CONNECTION=scm:git:github.com/AckeeCZ/ackee-guardian.git + POM_SCM_DEVELOPER_CONNECTION=scm:git:ssh://github.com/AckeeCZ/ackee-guardian.git + POM_SCM_URL=https://github.com/AckeeCZ/ackee-guardian/tree/main # Core artifact - CORE_ARTIFACT_ID=security-core - CORE_POM_NAME=Ackee Security Core + CORE_ARTIFACT_ID=guardian-core + CORE_POM_NAME=Ackee Guardian Core CORE_POM_YEAR=2024 - CORE_POM_DESCRIPTION=Core artifact of the Ackee Security library. Contains general-purpose security features. + CORE_POM_DESCRIPTION=Core artifact of the Ackee Guardian library. Contains general-purpose security features. """ private lateinit var executeCommand: ExecuteCommandStub diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsStub.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsStub.kt similarity index 83% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsStub.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsStub.kt index c0f9cdf..bfb65c8 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsStub.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsStub.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsTest.kt similarity index 94% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsTest.kt index 6147aa2..f212713 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetReleaseDependentProjectsTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetReleaseDependentProjectsTest.kt @@ -1,9 +1,9 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.IMPLEMENTATION_CONFIGURATION -import io.github.ackeecz.security.testutil.addDependencies -import io.github.ackeecz.security.testutil.addImplementationDependencies -import io.github.ackeecz.security.testutil.buildProject +import io.github.ackeecz.guardian.testutil.IMPLEMENTATION_CONFIGURATION +import io.github.ackeecz.guardian.testutil.addDependencies +import io.github.ackeecz.guardian.testutil.addImplementationDependencies +import io.github.ackeecz.guardian.testutil.buildProject import io.kotest.core.spec.style.FunSpec import io.kotest.datatest.withData import io.kotest.matchers.collections.shouldBeEmpty diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagStubs.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagStubs.kt similarity index 90% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagStubs.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagStubs.kt index 79f6fdd..7da9f00 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagStubs.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagStubs.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification import org.gradle.api.Project diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagTests.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagTests.kt similarity index 94% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagTests.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagTests.kt index 6a3f40b..8987c77 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/GetTagTests.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/GetTagTests.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.buildProject -import io.github.ackeecz.security.util.ExecuteCommand -import io.github.ackeecz.security.util.ExecuteCommandStub +import io.github.ackeecz.guardian.testutil.buildProject +import io.github.ackeecz.guardian.util.ExecuteCommand +import io.github.ackeecz.guardian.util.ExecuteCommandStub import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyBomVersionTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersionTest.kt similarity index 94% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyBomVersionTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersionTest.kt index eacd110..936bb8f 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyBomVersionTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyBomVersionTest.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.buildProject -import io.github.ackeecz.security.testutil.withVersion -import io.github.ackeecz.security.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX +import io.github.ackeecz.guardian.testutil.buildProject +import io.github.ackeecz.guardian.testutil.withVersion +import io.github.ackeecz.guardian.verification.GetTagTest.Companion.BOM_VERSION_TAG_PREFIX import io.kotest.core.spec.style.FunSpec import io.kotest.datatest.withData import io.kotest.matchers.shouldBe diff --git a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyPublishingTest.kt b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishingTest.kt similarity index 98% rename from build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyPublishingTest.kt rename to build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishingTest.kt index d8c411d..3e0426d 100644 --- a/build-logic/logic/src/test/kotlin/io/github/ackeecz/security/verification/VerifyPublishingTest.kt +++ b/build-logic/logic/src/test/kotlin/io/github/ackeecz/guardian/verification/VerifyPublishingTest.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.verification +package io.github.ackeecz.guardian.verification -import io.github.ackeecz.security.testutil.buildProject -import io.github.ackeecz.security.testutil.withVersion -import io.github.ackeecz.security.util.PublishableProject +import io.github.ackeecz.guardian.testutil.buildProject +import io.github.ackeecz.guardian.testutil.withVersion +import io.github.ackeecz.guardian.util.PublishableProject import io.kotest.core.spec.style.FunSpec import io.kotest.datatest.withData import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder diff --git a/build.gradle.kts b/build.gradle.kts index ac7b3c6..b21d682 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.ackeecz.security.preflightchecks) apply true + alias(libs.plugins.ackeecz.guardian.preflightchecks) apply true alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.detekt) apply false diff --git a/core-internal/build.gradle.kts b/core-internal/build.gradle.kts index 7e13fc5..d57e555 100644 --- a/core-internal/build.gradle.kts +++ b/core-internal/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testfixtures) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testfixtures) } android { - namespace = "io.github.ackeecz.security.core.internal" + namespace = "io.github.ackeecz.guardian.core.internal" } dependencies { diff --git a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/Base64Value.kt b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Base64Value.kt similarity index 58% rename from core-internal/src/main/java/io/github/ackeecz/security/core/internal/Base64Value.kt rename to core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Base64Value.kt index 505b5bc..3de0e5d 100644 --- a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/Base64Value.kt +++ b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Base64Value.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal @JvmInline public value class Base64Value(public val value: String) diff --git a/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Constants.kt b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Constants.kt new file mode 100644 index 0000000..09d67f0 --- /dev/null +++ b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/Constants.kt @@ -0,0 +1,6 @@ +package io.github.ackeecz.guardian.core.internal + +/** + * Default name of the SharedPreferences file used for storing keysets for Ackee Guardian library + */ +public const val ACKEE_GUARDIAN_KEYSET_PREFS_NAME: String = "__io_github_ackeecz_guardian_pref__" diff --git a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/SynchronizedDataHolder.kt b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/SynchronizedDataHolder.kt similarity index 96% rename from core-internal/src/main/java/io/github/ackeecz/security/core/internal/SynchronizedDataHolder.kt rename to core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/SynchronizedDataHolder.kt index d2367d5..7ca7993 100644 --- a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/SynchronizedDataHolder.kt +++ b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/SynchronizedDataHolder.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.sync.Mutex diff --git a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/WeakReferenceFactory.kt b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/WeakReferenceFactory.kt similarity index 89% rename from core-internal/src/main/java/io/github/ackeecz/security/core/internal/WeakReferenceFactory.kt rename to core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/WeakReferenceFactory.kt index c9759a7..aad8fe3 100644 --- a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/WeakReferenceFactory.kt +++ b/core-internal/src/main/java/io/github/ackeecz/guardian/core/internal/WeakReferenceFactory.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import java.lang.ref.WeakReference diff --git a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/Constants.kt b/core-internal/src/main/java/io/github/ackeecz/security/core/internal/Constants.kt deleted file mode 100644 index ce7bf50..0000000 --- a/core-internal/src/main/java/io/github/ackeecz/security/core/internal/Constants.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.ackeecz.security.core.internal - -/** - * Default name of the SharedPreferences file used for storing keysets for Ackee security library - */ -public const val ACKEE_SECURITY_KEYSET_PREFS_NAME: String = "__io_github_ackeecz_security_pref__" diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/AndroidTestWithKeyStore.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/AndroidTestWithKeyStore.kt similarity index 87% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/AndroidTestWithKeyStore.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/AndroidTestWithKeyStore.kt index 124669e..a624dda 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/AndroidTestWithKeyStore.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/AndroidTestWithKeyStore.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import android.os.Build import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.github.ackeecz.security.core.internal.junit.rule.AndroidFakeKeyStoreRule +import io.github.ackeecz.guardian.core.internal.junit.rule.AndroidFakeKeyStoreRule import org.junit.Rule import org.junit.runner.RunWith import org.robolectric.annotation.Config diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/TinkUtils.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/TinkUtils.kt similarity index 97% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/TinkUtils.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/TinkUtils.kt index 709ee0d..5541973 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/TinkUtils.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/TinkUtils.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import android.content.Context import com.google.crypto.tink.KeyTemplate diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/Utils.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/Utils.kt similarity index 91% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/Utils.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/Utils.kt index ca467c0..dad0e88 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/Utils.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/Utils.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import com.google.crypto.tink.shaded.protobuf.ByteString import io.kotest.matchers.shouldBe diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/WeakReferenceFactoryFake.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/WeakReferenceFactoryFake.kt similarity index 92% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/WeakReferenceFactoryFake.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/WeakReferenceFactoryFake.kt index 80c3bf3..85ff59e 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/WeakReferenceFactoryFake.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/WeakReferenceFactoryFake.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal +package io.github.ackeecz.guardian.core.internal import java.lang.ref.WeakReference diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt similarity index 99% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt index 53b7141..91db6f7 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/AndroidFakeKeyStoreRule.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal.junit.rule +package io.github.ackeecz.guardian.core.internal.junit.rule import android.security.keystore.KeyGenParameterSpec import org.bouncycastle.asn1.x500.X500Name diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/CoroutineRule.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/CoroutineRule.kt similarity index 82% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/CoroutineRule.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/CoroutineRule.kt index e84fec1..df546d0 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/junit/rule/CoroutineRule.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/junit/rule/CoroutineRule.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.core.internal.junit.rule +package io.github.ackeecz.guardian.core.internal.junit.rule -import io.github.ackeecz.security.core.internal.kotest.extension.CoroutineExtension +import io.github.ackeecz.guardian.core.internal.kotest.extension.CoroutineExtension import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestDispatcher import org.junit.rules.TestWatcher diff --git a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/kotest/extension/CoroutineExtension.kt b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/kotest/extension/CoroutineExtension.kt similarity index 93% rename from core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/kotest/extension/CoroutineExtension.kt rename to core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/kotest/extension/CoroutineExtension.kt index e369773..04c967f 100644 --- a/core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/core/internal/kotest/extension/CoroutineExtension.kt +++ b/core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/core/internal/kotest/extension/CoroutineExtension.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.core.internal.kotest.extension +package io.github.ackeecz.guardian.core.internal.kotest.extension import io.kotest.core.listeners.AfterEachListener import io.kotest.core.listeners.BeforeEachListener diff --git a/core/api/core.api b/core/api/core.api index 1760da3..b4379f7 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -1,5 +1,5 @@ -public final class io/github/ackeecz/security/core/MasterKey { - public static final field Companion Lio/github/ackeecz/security/core/MasterKey$Companion; +public final class io/github/ackeecz/guardian/core/MasterKey { + public static final field Companion Lio/github/ackeecz/guardian/core/MasterKey$Companion; public synthetic fun (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun getAlias ()Ljava/lang/String; @@ -7,10 +7,10 @@ public final class io/github/ackeecz/security/core/MasterKey { public fun hashCode ()I } -public final class io/github/ackeecz/security/core/MasterKey$Companion { +public final class io/github/ackeecz/guardian/core/MasterKey$Companion { public final fun createSafeDefaultSpecBuilder (Ljava/lang/String;)Landroid/security/keystore/KeyGenParameterSpec$Builder; - public static synthetic fun createSafeDefaultSpecBuilder$default (Lio/github/ackeecz/security/core/MasterKey$Companion;Ljava/lang/String;ILjava/lang/Object;)Landroid/security/keystore/KeyGenParameterSpec$Builder; + public static synthetic fun createSafeDefaultSpecBuilder$default (Lio/github/ackeecz/guardian/core/MasterKey$Companion;Ljava/lang/String;ILjava/lang/Object;)Landroid/security/keystore/KeyGenParameterSpec$Builder; public final fun getOrCreate (Landroid/security/keystore/KeyGenParameterSpec;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static synthetic fun getOrCreate$default (Lio/github/ackeecz/security/core/MasterKey$Companion;Landroid/security/keystore/KeyGenParameterSpec;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; + public static synthetic fun getOrCreate$default (Lio/github/ackeecz/guardian/core/MasterKey$Companion;Landroid/security/keystore/KeyGenParameterSpec;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b5c21ba..ba73943 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testing) - alias(libs.plugins.ackeecz.security.testing.android) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testing) + alias(libs.plugins.ackeecz.guardian.testing.android) } android { - namespace = "io.github.ackeecz.security.core" + namespace = "io.github.ackeecz.guardian.core" } dependencies { diff --git a/core/src/main/kotlin/io/github/ackeecz/security/core/MasterKey.kt b/core/src/main/kotlin/io/github/ackeecz/guardian/core/MasterKey.kt similarity index 99% rename from core/src/main/kotlin/io/github/ackeecz/security/core/MasterKey.kt rename to core/src/main/kotlin/io/github/ackeecz/guardian/core/MasterKey.kt index 5407658..c5047b6 100644 --- a/core/src/main/kotlin/io/github/ackeecz/security/core/MasterKey.kt +++ b/core/src/main/kotlin/io/github/ackeecz/guardian/core/MasterKey.kt @@ -16,7 +16,7 @@ * This file is based on the original MasterKeys from Jetpack Security Crypto library * https://developer.android.com/reference/kotlin/androidx/security/crypto/MasterKeys */ -package io.github.ackeecz.security.core +package io.github.ackeecz.guardian.core import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties diff --git a/core/src/test/kotlin/io/github/ackeecz/security/core/MasterKeyTest.kt b/core/src/test/kotlin/io/github/ackeecz/guardian/core/MasterKeyTest.kt similarity index 98% rename from core/src/test/kotlin/io/github/ackeecz/security/core/MasterKeyTest.kt rename to core/src/test/kotlin/io/github/ackeecz/guardian/core/MasterKeyTest.kt index 51f9bed..64e758c 100644 --- a/core/src/test/kotlin/io/github/ackeecz/security/core/MasterKeyTest.kt +++ b/core/src/test/kotlin/io/github/ackeecz/guardian/core/MasterKeyTest.kt @@ -1,9 +1,9 @@ -package io.github.ackeecz.security.core +package io.github.ackeecz.guardian.core import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties -import io.github.ackeecz.security.core.internal.AndroidTestWithKeyStore -import io.github.ackeecz.security.core.internal.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.core.internal.AndroidTestWithKeyStore +import io.github.ackeecz.guardian.core.internal.junit.rule.CoroutineRule import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.nulls.shouldNotBeNull diff --git a/datastore-core-internal/build.gradle.kts b/datastore-core-internal/build.gradle.kts index c43d6ff..7820541 100644 --- a/datastore-core-internal/build.gradle.kts +++ b/datastore-core-internal/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testfixtures) - alias(libs.plugins.ackeecz.security.tink) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testfixtures) + alias(libs.plugins.ackeecz.guardian.tink) } android { - namespace = "io.github.ackeecz.security.datastore.core.internal" + namespace = "io.github.ackeecz.guardian.datastore.core.internal" } dependencies { diff --git a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegate.kt b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegate.kt similarity index 93% rename from datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegate.kt rename to datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegate.kt index 6961090..aab9b68 100644 --- a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegate.kt +++ b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegate.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal import android.content.Context import androidx.datastore.core.DataStore diff --git a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt similarity index 78% rename from datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt rename to datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt index 976a5a3..6c7e825 100644 --- a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt +++ b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/DataStoreEncryptionSchemeKtx.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal import com.google.crypto.tink.KeyTemplate import com.google.crypto.tink.streamingaead.AesGcmHkdfStreamingKeyManager -import io.github.ackeecz.security.datastore.core.DataStoreEncryptionScheme +import io.github.ackeecz.guardian.datastore.core.DataStoreEncryptionScheme internal val DataStoreEncryptionScheme.keyTemplate: KeyTemplate get() = when (this) { diff --git a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/EncryptingSerializer.kt b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/EncryptingSerializer.kt similarity index 93% rename from datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/EncryptingSerializer.kt rename to datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/EncryptingSerializer.kt index 29f640d..088f84d 100644 --- a/datastore-core-internal/src/main/java/io/github/ackeecz/security/datastore/core/internal/EncryptingSerializer.kt +++ b/datastore-core-internal/src/main/java/io/github/ackeecz/guardian/datastore/core/internal/EncryptingSerializer.kt @@ -1,12 +1,12 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal import android.content.Context import androidx.datastore.core.Serializer import com.google.crypto.tink.StreamingAead import com.google.crypto.tink.integration.android.AndroidKeysetManager import com.google.crypto.tink.streamingaead.StreamingAeadConfig -import io.github.ackeecz.security.core.internal.SynchronizedDataHolder -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.core.internal.SynchronizedDataHolder +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegateWrapper.kt b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegateWrapper.kt similarity index 91% rename from datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegateWrapper.kt rename to datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegateWrapper.kt index aeb1b34..cffc09d 100644 --- a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/DataStoreDelegateWrapper.kt +++ b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/DataStoreDelegateWrapper.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal import androidx.datastore.core.DataStore diff --git a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/EncryptedDataStoreTest.kt b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/EncryptedDataStoreTest.kt similarity index 95% rename from datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/EncryptedDataStoreTest.kt rename to datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/EncryptedDataStoreTest.kt index 2e0e4c1..5a40b20 100644 --- a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/EncryptedDataStoreTest.kt +++ b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/EncryptedDataStoreTest.kt @@ -1,17 +1,17 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal import android.content.Context import androidx.datastore.core.DataStore import androidx.test.core.app.ApplicationProvider import com.google.crypto.tink.KeysetHandle import com.google.crypto.tink.StreamingAead -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.AndroidTestWithKeyStore -import io.github.ackeecz.security.core.internal.assertAesGcmHkdfEncryptionScheme -import io.github.ackeecz.security.core.internal.getKeysetHandle -import io.github.ackeecz.security.core.internal.junit.rule.CoroutineRule -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.DataStoreEncryptionScheme +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.AndroidTestWithKeyStore +import io.github.ackeecz.guardian.core.internal.assertAesGcmHkdfEncryptionScheme +import io.github.ackeecz.guardian.core.internal.getKeysetHandle +import io.github.ackeecz.guardian.core.internal.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.DataStoreEncryptionScheme import io.kotest.inspectors.forAll import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe @@ -33,8 +33,8 @@ import java.io.File import java.io.InputStream import kotlin.random.Random -private const val DEFAULT_KEYSET_PREFS_NAME = "__io_github_ackeecz_security_pref__" -private const val DEFAULT_KEYSET_ALIAS = "__io_github_ackeecz_security_datastore_keyset__" +private const val DEFAULT_KEYSET_PREFS_NAME = "__io_github_ackeecz_guardian_pref__" +private const val DEFAULT_KEYSET_ALIAS = "__io_github_ackeecz_guardian_datastore_keyset__" abstract class EncryptedDataStoreTest : AndroidTestWithKeyStore() { diff --git a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/Utils.kt b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/Utils.kt similarity index 68% rename from datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/Utils.kt rename to datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/Utils.kt index c0c9531..1f57e70 100644 --- a/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/security/datastore/core/internal/Utils.kt +++ b/datastore-core-internal/src/testFixtures/kotlin/io/github/ackeecz/guardian/datastore/core/internal/Utils.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.datastore.core.internal +package io.github.ackeecz.guardian.datastore.core.internal -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.DataStoreEncryptionScheme +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.DataStoreEncryptionScheme fun DataStoreCryptoParams.copy( encryptionScheme: DataStoreEncryptionScheme = this.encryptionScheme, diff --git a/datastore-core/api/datastore-core.api b/datastore-core/api/datastore-core.api index 00c4fe8..f94d14c 100644 --- a/datastore-core/api/datastore-core.api +++ b/datastore-core/api/datastore-core.api @@ -1,17 +1,17 @@ -public final class io/github/ackeecz/security/datastore/core/DataStoreCryptoParams { - public fun (Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getEncryptionScheme ()Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme; +public final class io/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams { + public fun (Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getEncryptionScheme ()Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme; public final fun getGetMasterKey ()Lkotlin/jvm/functions/Function1; public final fun getKeysetAlias ()Ljava/lang/String; public final fun getKeysetPrefsName ()Ljava/lang/String; } -public final class io/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme : java/lang/Enum { - public static final field AES256_GCM_HKDF_1MB Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme; - public static final field AES256_GCM_HKDF_4KB Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme; +public final class io/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme : java/lang/Enum { + public static final field AES256_GCM_HKDF_1MB Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme; + public static final field AES256_GCM_HKDF_4KB Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme; - public static fun values ()[Lio/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme; + public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme; + public static fun values ()[Lio/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme; } diff --git a/datastore-core/build.gradle.kts b/datastore-core/build.gradle.kts index e2121bf..3423268 100644 --- a/datastore-core/build.gradle.kts +++ b/datastore-core/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.tink) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.tink) } android { - namespace = "io.github.ackeecz.security.datastore.core" + namespace = "io.github.ackeecz.guardian.datastore.core" } dependencies { diff --git a/datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreCryptoParams.kt b/datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams.kt similarity index 81% rename from datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreCryptoParams.kt rename to datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams.kt index 78ace70..cc25640 100644 --- a/datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreCryptoParams.kt +++ b/datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.datastore.core +package io.github.ackeecz.guardian.datastore.core -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.ACKEE_SECURITY_KEYSET_PREFS_NAME +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.ACKEE_GUARDIAN_KEYSET_PREFS_NAME /** * Crypto params used for configuration of encrypted DataStores. @@ -18,7 +18,7 @@ import io.github.ackeecz.security.core.internal.ACKEE_SECURITY_KEYSET_PREFS_NAME */ public class DataStoreCryptoParams( public val encryptionScheme: DataStoreEncryptionScheme, - public val keysetPrefsName: String = ACKEE_SECURITY_KEYSET_PREFS_NAME, + public val keysetPrefsName: String = ACKEE_GUARDIAN_KEYSET_PREFS_NAME, public val keysetAlias: String = KEYSET_ALIAS, public val getMasterKey: suspend () -> MasterKey, ) { @@ -29,6 +29,6 @@ public class DataStoreCryptoParams( * Default keyset alias used for encryption of DataStore files. It is used as a key in * SharedPreferences key-value pair, where value is the actual keyset data. */ - private const val KEYSET_ALIAS = "__io_github_ackeecz_security_datastore_keyset__" + private const val KEYSET_ALIAS = "__io_github_ackeecz_guardian_datastore_keyset__" } } diff --git a/datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme.kt b/datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme.kt similarity index 92% rename from datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme.kt rename to datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme.kt index 3ad1cd7..14cb874 100644 --- a/datastore-core/src/main/java/io/github/ackeecz/security/datastore/core/DataStoreEncryptionScheme.kt +++ b/datastore-core/src/main/java/io/github/ackeecz/guardian/datastore/core/DataStoreEncryptionScheme.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.core +package io.github.ackeecz.guardian.datastore.core /** * The encryption scheme to encrypt DataStore files. diff --git a/datastore-preferences/api/datastore-preferences.api b/datastore-preferences/api/datastore-preferences.api index 9cb6439..33382a8 100644 --- a/datastore-preferences/api/datastore-preferences.api +++ b/datastore-preferences/api/datastore-preferences.api @@ -1,10 +1,10 @@ -public final class io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreDelegateKt { - public static final fun encryptedPreferencesDataStore (Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun encryptedPreferencesDataStore$default (Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; +public final class io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreDelegateKt { + public static final fun encryptedPreferencesDataStore (Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun encryptedPreferencesDataStore$default (Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; } -public final class io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreFactoryKt { - public static final fun createEncrypted (Landroidx/datastore/preferences/core/PreferenceDataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;)Landroidx/datastore/core/DataStore; - public static synthetic fun createEncrypted$default (Landroidx/datastore/preferences/core/PreferenceDataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/datastore/core/DataStore; +public final class io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreFactoryKt { + public static final fun createEncrypted (Landroidx/datastore/preferences/core/PreferenceDataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;)Landroidx/datastore/core/DataStore; + public static synthetic fun createEncrypted$default (Landroidx/datastore/preferences/core/PreferenceDataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/datastore/core/DataStore; } diff --git a/datastore-preferences/build.gradle.kts b/datastore-preferences/build.gradle.kts index 9fa2fb5..b885eb8 100644 --- a/datastore-preferences/build.gradle.kts +++ b/datastore-preferences/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testing) - alias(libs.plugins.ackeecz.security.testing.android) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testing) + alias(libs.plugins.ackeecz.guardian.testing.android) } android { - namespace = "io.github.ackeecz.security.datastore.preferences" + namespace = "io.github.ackeecz.guardian.datastore.preferences" } dependencies { diff --git a/datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt b/datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt similarity index 95% rename from datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt rename to datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt index f61a965..8624da2 100644 --- a/datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt +++ b/datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreDelegate.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.preferences +package io.github.ackeecz.guardian.datastore.preferences import android.content.Context import androidx.datastore.core.CorruptionException @@ -8,8 +8,8 @@ import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.DataStoreDelegate +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.DataStoreDelegate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt b/datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt similarity index 95% rename from datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt rename to datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt index a030718..4cc43e8 100644 --- a/datastore-preferences/src/main/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt +++ b/datastore-preferences/src/main/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreFactory.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.preferences +package io.github.ackeecz.guardian.datastore.preferences import android.content.Context import androidx.datastore.core.CorruptionException @@ -11,8 +11,8 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.PreferencesSerializer import androidx.datastore.preferences.preferencesDataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.EncryptingSerializer +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.EncryptingSerializer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/datastore-preferences/src/test/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreTests.kt b/datastore-preferences/src/test/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreTests.kt similarity index 93% rename from datastore-preferences/src/test/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreTests.kt rename to datastore-preferences/src/test/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreTests.kt index 1c81aff..cccd7cc 100644 --- a/datastore-preferences/src/test/java/io/github/ackeecz/security/datastore/preferences/EncryptedPreferenceDataStoreTests.kt +++ b/datastore-preferences/src/test/java/io/github/ackeecz/guardian/datastore/preferences/EncryptedPreferenceDataStoreTests.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore.preferences +package io.github.ackeecz.guardian.datastore.preferences import android.content.Context import androidx.datastore.core.DataStore @@ -8,9 +8,9 @@ import androidx.datastore.preferences.core.PreferencesSerializer import androidx.datastore.preferences.core.longPreferencesKey import androidx.datastore.preferences.core.mutablePreferencesOf import androidx.datastore.preferences.preferencesDataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.DataStoreDelegateWrapper -import io.github.ackeecz.security.datastore.core.internal.EncryptedDataStoreTest +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.DataStoreDelegateWrapper +import io.github.ackeecz.guardian.datastore.core.internal.EncryptedDataStoreTest import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.test.runTest import okio.buffer diff --git a/datastore/api/datastore.api b/datastore/api/datastore.api index ade2e66..754e0a2 100644 --- a/datastore/api/datastore.api +++ b/datastore/api/datastore.api @@ -1,10 +1,10 @@ -public final class io/github/ackeecz/security/datastore/EncryptedDataStoreDelegateKt { - public static final fun encryptedDataStore (Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun encryptedDataStore$default (Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; +public final class io/github/ackeecz/guardian/datastore/EncryptedDataStoreDelegateKt { + public static final fun encryptedDataStore (Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun encryptedDataStore$default (Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Ljava/lang/String;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Lkotlin/jvm/functions/Function1;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; } -public final class io/github/ackeecz/security/datastore/EncryptedDataStoreFactoryKt { - public static final fun createEncrypted (Landroidx/datastore/core/DataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;)Landroidx/datastore/core/DataStore; - public static synthetic fun createEncrypted$default (Landroidx/datastore/core/DataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/security/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/datastore/core/DataStore; +public final class io/github/ackeecz/guardian/datastore/EncryptedDataStoreFactoryKt { + public static final fun createEncrypted (Landroidx/datastore/core/DataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;)Landroidx/datastore/core/DataStore; + public static synthetic fun createEncrypted$default (Landroidx/datastore/core/DataStoreFactory;Landroid/content/Context;Lio/github/ackeecz/guardian/datastore/core/DataStoreCryptoParams;Landroidx/datastore/core/Serializer;Landroidx/datastore/core/handlers/ReplaceFileCorruptionHandler;Ljava/util/List;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/datastore/core/DataStore; } diff --git a/datastore/build.gradle.kts b/datastore/build.gradle.kts index ea73816..577e5b1 100644 --- a/datastore/build.gradle.kts +++ b/datastore/build.gradle.kts @@ -1,15 +1,15 @@ import org.gradle.kotlin.dsl.android plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testing) - alias(libs.plugins.ackeecz.security.testing.android) - alias(libs.plugins.ackeecz.security.testing.protobuf) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testing) + alias(libs.plugins.ackeecz.guardian.testing.android) + alias(libs.plugins.ackeecz.guardian.testing.protobuf) } android { - namespace = "io.github.ackeecz.security.datastore" + namespace = "io.github.ackeecz.guardian.datastore" } dependencies { diff --git a/datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreDelegate.kt b/datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreDelegate.kt similarity index 95% rename from datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreDelegate.kt rename to datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreDelegate.kt index 5975aa8..92b6cc0 100644 --- a/datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreDelegate.kt +++ b/datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreDelegate.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore +package io.github.ackeecz.guardian.datastore import android.content.Context import androidx.datastore.core.CorruptionException @@ -8,8 +8,8 @@ import androidx.datastore.core.DataStoreFactory import androidx.datastore.core.Serializer import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler import androidx.datastore.dataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.DataStoreDelegate +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.DataStoreDelegate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreFactory.kt b/datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreFactory.kt similarity index 94% rename from datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreFactory.kt rename to datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreFactory.kt index 8de5dd3..2c53b7d 100644 --- a/datastore/src/main/java/io/github/ackeecz/security/datastore/EncryptedDataStoreFactory.kt +++ b/datastore/src/main/java/io/github/ackeecz/guardian/datastore/EncryptedDataStoreFactory.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore +package io.github.ackeecz.guardian.datastore import android.content.Context import androidx.datastore.core.CorruptionException @@ -8,8 +8,8 @@ import androidx.datastore.core.DataStoreFactory import androidx.datastore.core.Serializer import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler import androidx.datastore.dataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.EncryptingSerializer +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.EncryptingSerializer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/datastore/src/test/java/io/github/ackeecz/security/datastore/EncryptedTypedDataStoreTests.kt b/datastore/src/test/java/io/github/ackeecz/guardian/datastore/EncryptedTypedDataStoreTests.kt similarity index 92% rename from datastore/src/test/java/io/github/ackeecz/security/datastore/EncryptedTypedDataStoreTests.kt rename to datastore/src/test/java/io/github/ackeecz/guardian/datastore/EncryptedTypedDataStoreTests.kt index a757638..d3b41b0 100644 --- a/datastore/src/test/java/io/github/ackeecz/security/datastore/EncryptedTypedDataStoreTests.kt +++ b/datastore/src/test/java/io/github/ackeecz/guardian/datastore/EncryptedTypedDataStoreTests.kt @@ -1,12 +1,12 @@ -package io.github.ackeecz.security.datastore +package io.github.ackeecz.guardian.datastore import android.content.Context import androidx.datastore.core.DataStore import androidx.datastore.core.DataStoreFactory import androidx.datastore.dataStoreFile -import io.github.ackeecz.security.datastore.core.DataStoreCryptoParams -import io.github.ackeecz.security.datastore.core.internal.DataStoreDelegateWrapper -import io.github.ackeecz.security.datastore.core.internal.EncryptedDataStoreTest +import io.github.ackeecz.guardian.datastore.core.DataStoreCryptoParams +import io.github.ackeecz.guardian.datastore.core.internal.DataStoreDelegateWrapper +import io.github.ackeecz.guardian.datastore.core.internal.EncryptedDataStoreTest import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/datastore/src/test/java/io/github/ackeecz/security/datastore/TestDataSerializer.kt b/datastore/src/test/java/io/github/ackeecz/guardian/datastore/TestDataSerializer.kt similarity index 94% rename from datastore/src/test/java/io/github/ackeecz/security/datastore/TestDataSerializer.kt rename to datastore/src/test/java/io/github/ackeecz/guardian/datastore/TestDataSerializer.kt index be835f0..36f6c8e 100644 --- a/datastore/src/test/java/io/github/ackeecz/security/datastore/TestDataSerializer.kt +++ b/datastore/src/test/java/io/github/ackeecz/guardian/datastore/TestDataSerializer.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.datastore +package io.github.ackeecz.guardian.datastore import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer diff --git a/datastore/src/test/proto/test_data.proto b/datastore/src/test/proto/test_data.proto index 388b0a2..cc44202 100644 --- a/datastore/src/test/proto/test_data.proto +++ b/datastore/src/test/proto/test_data.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "io.github.ackeecz.security.datastore"; +option java_package = "io.github.ackeecz.guardian.datastore"; option java_multiple_files = true; message TestData { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d08ec71..7d041d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -71,13 +71,13 @@ kotlin-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compa mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" } protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradlePlugin" } -# Contention plugins defined by this project -ackeecz-security-android-application = { id = "ackeecz.security.android.application" } -ackeecz-security-android-library = { id = "ackeecz.security.android.library" } -ackeecz-security-preflightchecks = { id = "ackeecz.security.preflightchecks" } -ackeecz-security-publishing = { id = "ackeecz.security.publishing" } -ackeecz-security-testfixtures = { id = "ackeecz.security.testfixtures" } -ackeecz-security-testing = { id = "ackeecz.security.testing" } -ackeecz-security-testing-android = { id = "ackeecz.security.testing.android" } -ackeecz-security-testing-protobuf = { id = "ackeecz.security.testing.protobuf" } -ackeecz-security-tink = { id = "ackeecz.security.tink" } +# Convention plugins defined by this project +ackeecz-guardian-android-application = { id = "ackeecz.guardian.android.application" } +ackeecz-guardian-android-library = { id = "ackeecz.guardian.android.library" } +ackeecz-guardian-preflightchecks = { id = "ackeecz.guardian.preflightchecks" } +ackeecz-guardian-publishing = { id = "ackeecz.guardian.publishing" } +ackeecz-guardian-testfixtures = { id = "ackeecz.guardian.testfixtures" } +ackeecz-guardian-testing = { id = "ackeecz.guardian.testing" } +ackeecz-guardian-testing-android = { id = "ackeecz.guardian.testing.android" } +ackeecz-guardian-testing-protobuf = { id = "ackeecz.guardian.testing.protobuf" } +ackeecz-guardian-tink = { id = "ackeecz.guardian.tink" } diff --git a/jetpack/api/jetpack.api b/jetpack/api/jetpack.api index 7931a46..938a7b8 100644 --- a/jetpack/api/jetpack.api +++ b/jetpack/api/jetpack.api @@ -1,30 +1,30 @@ -public final class io/github/ackeecz/security/jetpack/EncryptedFile { - public synthetic fun (Lio/github/ackeecz/security/jetpack/EncryptedFile$Builder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class io/github/ackeecz/guardian/jetpack/EncryptedFile { + public synthetic fun (Lio/github/ackeecz/guardian/jetpack/EncryptedFile$Builder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun openFileInput (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public final fun openFileOutput (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } -public final class io/github/ackeecz/security/jetpack/EncryptedFile$Builder { - public fun (Ljava/io/File;Landroid/content/Context;Lio/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme;Lkotlin/jvm/functions/Function1;)V - public final fun build ()Lio/github/ackeecz/security/jetpack/EncryptedFile; - public final fun setBackgroundDispatcher (Lkotlinx/coroutines/CoroutineDispatcher;)Lio/github/ackeecz/security/jetpack/EncryptedFile$Builder; - public final fun setKeysetAlias (Ljava/lang/String;)Lio/github/ackeecz/security/jetpack/EncryptedFile$Builder; - public final fun setKeysetPrefName (Ljava/lang/String;)Lio/github/ackeecz/security/jetpack/EncryptedFile$Builder; +public final class io/github/ackeecz/guardian/jetpack/EncryptedFile$Builder { + public fun (Ljava/io/File;Landroid/content/Context;Lio/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme;Lkotlin/jvm/functions/Function1;)V + public final fun build ()Lio/github/ackeecz/guardian/jetpack/EncryptedFile; + public final fun setBackgroundDispatcher (Lkotlinx/coroutines/CoroutineDispatcher;)Lio/github/ackeecz/guardian/jetpack/EncryptedFile$Builder; + public final fun setKeysetAlias (Ljava/lang/String;)Lio/github/ackeecz/guardian/jetpack/EncryptedFile$Builder; + public final fun setKeysetPrefName (Ljava/lang/String;)Lio/github/ackeecz/guardian/jetpack/EncryptedFile$Builder; } -public final class io/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme : java/lang/Enum { - public static final field AES256_GCM_HKDF_1MB Lio/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme; - public static final field AES256_GCM_HKDF_4KB Lio/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme; +public final class io/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme : java/lang/Enum { + public static final field AES256_GCM_HKDF_1MB Lio/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme; + public static final field AES256_GCM_HKDF_4KB Lio/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme; public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme; - public static fun values ()[Lio/github/ackeecz/security/jetpack/EncryptedFile$FileEncryptionScheme; + public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme; + public static fun values ()[Lio/github/ackeecz/guardian/jetpack/EncryptedFile$FileEncryptionScheme; } -public abstract interface class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences { - public static final field Companion Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$Companion; +public abstract interface class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences { + public static final field Companion Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$Companion; public abstract fun contains (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public abstract fun edit ()Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$Editor; + public abstract fun edit ()Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$Editor; public abstract fun edit (ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun getAll (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun getBoolean (Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -33,21 +33,21 @@ public abstract interface class io/github/ackeecz/security/jetpack/EncryptedShar public abstract fun getLong (Ljava/lang/String;JLkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun getString (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun getStringSet (Ljava/lang/String;Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public abstract fun registerOnSharedPreferenceChangeListener (Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener;)V - public abstract fun unregisterOnSharedPreferenceChangeListener (Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener;)V + public abstract fun registerOnSharedPreferenceChangeListener (Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener;)V + public abstract fun unregisterOnSharedPreferenceChangeListener (Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener;)V } -public final class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$Companion { - public final fun create (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme;Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme;)Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences; +public final class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$Companion { + public final fun create (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme;Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme;)Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences; } -public final class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$DefaultImpls { - public static synthetic fun edit$default (Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; +public final class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$DefaultImpls { + public static synthetic fun edit$default (Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } -public abstract interface class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$Editor { +public abstract interface class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$Editor { public abstract fun apply (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public abstract fun clear ()Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$Editor; + public abstract fun clear ()Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$Editor; public abstract fun commit (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun putBoolean (Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun putFloat (Ljava/lang/String;FLkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -58,27 +58,27 @@ public abstract interface class io/github/ackeecz/security/jetpack/EncryptedShar public abstract fun remove (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } -public abstract interface class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener { - public abstract fun onSharedPreferenceChanged (Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences;Ljava/lang/String;)V +public abstract interface class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$OnSharedPreferenceChangeListener { + public abstract fun onSharedPreferenceChanged (Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences;Ljava/lang/String;)V } -public final class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme : java/lang/Enum { - public static final field AES256_SIV Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; +public final class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme : java/lang/Enum { + public static final field AES256_SIV Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; - public static fun values ()[Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; + public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; + public static fun values ()[Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefKeyEncryptionScheme; } -public final class io/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme : java/lang/Enum { - public static final field AES256_GCM Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; +public final class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme : java/lang/Enum { + public static final field AES256_GCM Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; - public static fun values ()[Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; + public static fun valueOf (Ljava/lang/String;)Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; + public static fun values ()[Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences$PrefValueEncryptionScheme; } -public final class io/github/ackeecz/security/jetpack/EncryptedSharedPreferencesAdapterKt { - public static final fun adaptToSharedPreferences (Lio/github/ackeecz/security/jetpack/EncryptedSharedPreferences;)Landroid/content/SharedPreferences; +public final class io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferencesAdapterKt { + public static final fun adaptToSharedPreferences (Lio/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences;)Landroid/content/SharedPreferences; } diff --git a/jetpack/build.gradle.kts b/jetpack/build.gradle.kts index eb34a05..65b4982 100644 --- a/jetpack/build.gradle.kts +++ b/jetpack/build.gradle.kts @@ -1,13 +1,13 @@ plugins { - alias(libs.plugins.ackeecz.security.android.library) - alias(libs.plugins.ackeecz.security.publishing) - alias(libs.plugins.ackeecz.security.testing) - alias(libs.plugins.ackeecz.security.testing.android) - alias(libs.plugins.ackeecz.security.tink) + alias(libs.plugins.ackeecz.guardian.android.library) + alias(libs.plugins.ackeecz.guardian.publishing) + alias(libs.plugins.ackeecz.guardian.testing) + alias(libs.plugins.ackeecz.guardian.testing.android) + alias(libs.plugins.ackeecz.guardian.tink) } android { - namespace = "io.github.ackeecz.security.jetpack" + namespace = "io.github.ackeecz.guardian.jetpack" } dependencies { diff --git a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedFile.kt b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedFile.kt similarity index 98% rename from jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedFile.kt rename to jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedFile.kt index d4ed2b9..db001fd 100644 --- a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedFile.kt +++ b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedFile.kt @@ -16,7 +16,7 @@ * This file is based on the original EncryptedFile from Jetpack Security Crypto library * https://developer.android.com/reference/kotlin/androidx/security/crypto/EncryptedFile */ -package io.github.ackeecz.security.jetpack +package io.github.ackeecz.guardian.jetpack import android.content.Context import com.google.crypto.tink.KeyTemplate @@ -24,8 +24,8 @@ import com.google.crypto.tink.StreamingAead import com.google.crypto.tink.integration.android.AndroidKeysetManager import com.google.crypto.tink.streamingaead.AesGcmHkdfStreamingKeyManager import com.google.crypto.tink.streamingaead.StreamingAeadConfig -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.SynchronizedDataHolder +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.SynchronizedDataHolder import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import java.io.File diff --git a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferences.kt b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences.kt similarity index 99% rename from jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferences.kt rename to jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences.kt index 51381f4..6585756 100644 --- a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferences.kt +++ b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferences.kt @@ -16,7 +16,7 @@ * This file is based on the original EncryptedSharedPreferences from Jetpack Security Crypto library * https://developer.android.com/reference/kotlin/androidx/security/crypto/EncryptedSharedPreferences */ -package io.github.ackeecz.security.jetpack +package io.github.ackeecz.guardian.jetpack import android.content.Context import android.content.SharedPreferences @@ -31,10 +31,10 @@ import com.google.crypto.tink.daead.AesSivKeyManager import com.google.crypto.tink.daead.DeterministicAeadConfig import com.google.crypto.tink.integration.android.AndroidKeysetManager import com.google.crypto.tink.subtle.Base64 -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.Base64Value -import io.github.ackeecz.security.core.internal.SynchronizedDataHolder -import io.github.ackeecz.security.core.internal.WeakReferenceFactory +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.Base64Value +import io.github.ackeecz.guardian.core.internal.SynchronizedDataHolder +import io.github.ackeecz.guardian.core.internal.WeakReferenceFactory import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferencesAdapter.kt b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferencesAdapter.kt similarity index 98% rename from jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferencesAdapter.kt rename to jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferencesAdapter.kt index b08e443..e983da1 100644 --- a/jetpack/src/main/java/io/github/ackeecz/security/jetpack/EncryptedSharedPreferencesAdapter.kt +++ b/jetpack/src/main/java/io/github/ackeecz/guardian/jetpack/EncryptedSharedPreferencesAdapter.kt @@ -1,8 +1,8 @@ -package io.github.ackeecz.security.jetpack +package io.github.ackeecz.guardian.jetpack import android.content.SharedPreferences import androidx.annotation.VisibleForTesting -import io.github.ackeecz.security.core.internal.WeakReferenceFactory +import io.github.ackeecz.guardian.core.internal.WeakReferenceFactory import kotlinx.coroutines.runBlocking import java.lang.ref.WeakReference import kotlin.apply diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/EncryptedFileTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/EncryptedFileTest.kt similarity index 96% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/EncryptedFileTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/EncryptedFileTest.kt index 923c7bd..bd1e1d7 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/EncryptedFileTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/EncryptedFileTest.kt @@ -1,14 +1,14 @@ -package io.github.ackeecz.security.jetpack +package io.github.ackeecz.guardian.jetpack import android.content.Context import androidx.test.core.app.ApplicationProvider import com.google.crypto.tink.KeysetHandle import com.google.crypto.tink.StreamingAead -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.AndroidTestWithKeyStore -import io.github.ackeecz.security.core.internal.assertAesGcmHkdfEncryptionScheme -import io.github.ackeecz.security.core.internal.getKeysetHandle -import io.github.ackeecz.security.core.internal.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.AndroidTestWithKeyStore +import io.github.ackeecz.guardian.core.internal.assertAesGcmHkdfEncryptionScheme +import io.github.ackeecz.guardian.core.internal.getKeysetHandle +import io.github.ackeecz.guardian.core.internal.junit.rule.CoroutineRule import io.kotest.assertions.throwables.shouldThrow import io.kotest.inspectors.forAll import io.kotest.matchers.nulls.shouldNotBeNull diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt similarity index 94% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt index a0fbbe7..9792f7a 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesAdapterTest.kt @@ -1,15 +1,15 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit import androidx.test.core.app.ApplicationProvider -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.AndroidTestWithKeyStore -import io.github.ackeecz.security.core.internal.WeakReferenceFactoryFake -import io.github.ackeecz.security.core.internal.junit.rule.CoroutineRule -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferencesAdapter +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.AndroidTestWithKeyStore +import io.github.ackeecz.guardian.core.internal.WeakReferenceFactoryFake +import io.github.ackeecz.guardian.core.internal.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferencesAdapter import io.kotest.common.runBlocking import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldBeEmpty diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesTest.kt similarity index 89% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesTest.kt index 99e5a2c..b9fc9b8 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptedSharedPreferencesTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptedSharedPreferencesTest.kt @@ -1,15 +1,15 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs import android.content.Context import android.content.SharedPreferences import androidx.test.core.app.ApplicationProvider -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.AndroidTestWithKeyStore -import io.github.ackeecz.security.core.internal.WeakReferenceFactoryFake -import io.github.ackeecz.security.core.internal.junit.rule.CoroutineRule -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences.PrefKeyEncryptionScheme -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences.PrefValueEncryptionScheme +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.AndroidTestWithKeyStore +import io.github.ackeecz.guardian.core.internal.WeakReferenceFactoryFake +import io.github.ackeecz.guardian.core.internal.junit.rule.CoroutineRule +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences.PrefKeyEncryptionScheme +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences.PrefValueEncryptionScheme import kotlinx.coroutines.test.UnconfinedTestDispatcher import org.junit.Rule diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptionDecryptionTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptionDecryptionTest.kt similarity index 96% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptionDecryptionTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptionDecryptionTest.kt index 700311c..bb94394 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/EncryptionDecryptionTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/EncryptionDecryptionTest.kt @@ -1,4 +1,4 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs import android.content.SharedPreferences import com.google.crypto.tink.Aead @@ -11,15 +11,15 @@ import com.google.crypto.tink.proto.AesGcmKey import com.google.crypto.tink.proto.AesSivKey import com.google.crypto.tink.shaded.protobuf.ByteString import com.google.crypto.tink.subtle.Base64 -import io.github.ackeecz.security.core.MasterKey -import io.github.ackeecz.security.core.internal.getFirstKeyDataValue -import io.github.ackeecz.security.core.internal.remainingToByteArray -import io.github.ackeecz.security.core.internal.shouldHaveBitSize -import io.github.ackeecz.security.core.internal.shouldHaveTypeUrlFromTemplate -import io.github.ackeecz.security.core.internal.utf8ByteSize -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences.PrefKeyEncryptionScheme -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences.PrefValueEncryptionScheme +import io.github.ackeecz.guardian.core.MasterKey +import io.github.ackeecz.guardian.core.internal.getFirstKeyDataValue +import io.github.ackeecz.guardian.core.internal.remainingToByteArray +import io.github.ackeecz.guardian.core.internal.shouldHaveBitSize +import io.github.ackeecz.guardian.core.internal.shouldHaveTypeUrlFromTemplate +import io.github.ackeecz.guardian.core.internal.utf8ByteSize +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences.PrefKeyEncryptionScheme +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences.PrefValueEncryptionScheme import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldContain import io.kotest.matchers.nulls.shouldNotBeNull @@ -122,7 +122,7 @@ internal class EncryptionDecryptionTest : EncryptedSharedPreferencesTest() { prefsFileName: String, keysetAlias: String, ): KeysetHandle { - return io.github.ackeecz.security.core.internal.getKeysetHandle( + return io.github.ackeecz.guardian.core.internal.getKeysetHandle( context = context, masterKeyUri = masterKey.keyStoreUri, keysetPrefsName = prefsFileName, diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/GetPreferencesTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/GetPreferencesTest.kt similarity index 98% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/GetPreferencesTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/GetPreferencesTest.kt index 8402ec4..2ecf57c 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/GetPreferencesTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/GetPreferencesTest.kt @@ -1,6 +1,6 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences import io.kotest.assertions.throwables.shouldThrow import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldHaveSize diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt similarity index 95% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt index 47c6cc2..3bbe639 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/OtherEncryptedSharedPreferencesTest.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs -import io.github.ackeecz.security.core.internal.WeakReferenceFactoryFake -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.core.internal.WeakReferenceFactoryFake +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences import io.kotest.assertions.throwables.shouldThrow import io.kotest.inspectors.forAll import io.kotest.matchers.shouldBe diff --git a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/TransactionTest.kt b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/TransactionTest.kt similarity index 98% rename from jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/TransactionTest.kt rename to jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/TransactionTest.kt index c96c6da..7da15ad 100644 --- a/jetpack/src/test/java/io/github/ackeecz/security/jetpack/prefs/TransactionTest.kt +++ b/jetpack/src/test/java/io/github/ackeecz/guardian/jetpack/prefs/TransactionTest.kt @@ -1,7 +1,7 @@ -package io.github.ackeecz.security.jetpack.prefs +package io.github.ackeecz.guardian.jetpack.prefs import android.os.Looper -import io.github.ackeecz.security.jetpack.EncryptedSharedPreferences +import io.github.ackeecz.guardian.jetpack.EncryptedSharedPreferences import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldContain import io.kotest.matchers.collections.shouldContainOnlyNulls diff --git a/lib.properties b/lib.properties index 35037f7..ef293f2 100644 --- a/lib.properties +++ b/lib.properties @@ -1,66 +1,66 @@ # Common properties for all artifacts GROUP_ID=io.github.ackeecz -POM_URL=https://github.com/AckeeCZ/ackee-android-security +POM_URL=https://github.com/AckeeCZ/ackee-guardian POM_DEVELOPER_ID=ackee POM_DEVELOPER_NAME=Ackee POM_DEVELOPER_EMAIL=info@ackee.cz POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt -POM_SCM_CONNECTION=scm:git:github.com/AckeeCZ/ackee-android-security.git -POM_SCM_DEVELOPER_CONNECTION=scm:git:ssh://github.com/AckeeCZ/ackee-android-security.git -POM_SCM_URL=https://github.com/AckeeCZ/ackee-android-security/tree/main +POM_SCM_CONNECTION=scm:git:github.com/AckeeCZ/ackee-guardian.git +POM_SCM_DEVELOPER_CONNECTION=scm:git:ssh://github.com/AckeeCZ/ackee-guardian.git +POM_SCM_URL=https://github.com/AckeeCZ/ackee-guardian/tree/main # BOM BOM_VERSION=1.0.0 -BOM_ARTIFACT_ID=security-bom -BOM_POM_NAME=Ackee Security BOM +BOM_ARTIFACT_ID=guardian-bom +BOM_POM_NAME=Ackee Guardian BOM BOM_POM_YEAR=2024 -BOM_POM_DESCRIPTION=BOM artifact of the Ackee Security library. +BOM_POM_DESCRIPTION=BOM artifact of the Ackee Guardian library. # Core artifact CORE_VERSION=1.0.0 -CORE_ARTIFACT_ID=security-core -CORE_POM_NAME=Ackee Security Core +CORE_ARTIFACT_ID=guardian-core +CORE_POM_NAME=Ackee Guardian Core CORE_POM_YEAR=2024 -CORE_POM_DESCRIPTION=Core artifact of the Ackee Security library. Contains general-purpose security features. +CORE_POM_DESCRIPTION=Core artifact of the Ackee Guardian library. Contains general-purpose security features. # Core Internal artifact CORE_INTERNAL_VERSION=1.0.0 -CORE_INTERNAL_ARTIFACT_ID=security-core-internal -CORE_INTERNAL_POM_NAME=Ackee Security Core Internal +CORE_INTERNAL_ARTIFACT_ID=guardian-core-internal +CORE_INTERNAL_POM_NAME=Ackee Guardian Core Internal CORE_INTERNAL_POM_YEAR=2024 -CORE_INTERNAL_POM_DESCRIPTION=Core Internal artifact of the Ackee Security library. Contains code meant to be used only by Ackee Security library artifacts! You should never depend on this artifact directly. +CORE_INTERNAL_POM_DESCRIPTION=Core Internal artifact of the Ackee Guardian library. Contains code meant to be used only by Ackee Guardian library artifacts! You should never depend on this artifact directly. # DataStore common DATASTORE_VERSION=1.0.0 # DataStore artifact -DATASTORE_ARTIFACT_ID=security-datastore -DATASTORE_POM_NAME=Ackee Security DataStore +DATASTORE_ARTIFACT_ID=guardian-datastore +DATASTORE_POM_NAME=Ackee Guardian DataStore DATASTORE_POM_YEAR=2024 -DATASTORE_POM_DESCRIPTION=DataStore artifact of the Ackee Security library. Contains encrypted typed DataStore (such as Proto). +DATASTORE_POM_DESCRIPTION=DataStore artifact of the Ackee Guardian library. Contains encrypted typed DataStore (such as Proto). # DataStore Core artifact -DATASTORE_CORE_ARTIFACT_ID=security-datastore-core -DATASTORE_CORE_POM_NAME=Ackee Security DataStore Core +DATASTORE_CORE_ARTIFACT_ID=guardian-datastore-core +DATASTORE_CORE_POM_NAME=Ackee Guardian DataStore Core DATASTORE_CORE_POM_YEAR=2024 -DATASTORE_CORE_POM_DESCRIPTION=DataStore Core artifact of the Ackee Security library. Contains core logic common to DataStore artifacts. Clients do not need to depend on this directly. +DATASTORE_CORE_POM_DESCRIPTION=DataStore Core artifact of the Ackee Guardian library. Contains core logic common to DataStore artifacts. Clients do not need to depend on this directly. # DataStore Core Internal artifact -DATASTORE_CORE_INTERNAL_ARTIFACT_ID=security-datastore-core-internal -DATASTORE_CORE_INTERNAL_POM_NAME=Ackee Security DataStore Core Internal +DATASTORE_CORE_INTERNAL_ARTIFACT_ID=guardian-datastore-core-internal +DATASTORE_CORE_INTERNAL_POM_NAME=Ackee Guardian DataStore Core Internal DATASTORE_CORE_INTERNAL_POM_YEAR=2024 -DATASTORE_CORE_INTERNAL_POM_DESCRIPTION=DataStore Core Internal artifact of the Ackee Security library. Contains code meant to be used only by Ackee Security DataStore artifacts! You should never depend on this artifact directly. +DATASTORE_CORE_INTERNAL_POM_DESCRIPTION=DataStore Core Internal artifact of the Ackee Guardian library. Contains code meant to be used only by Ackee Guardian DataStore artifacts! You should never depend on this artifact directly. # DataStore Preferences artifact -DATASTORE_PREFERENCES_ARTIFACT_ID=security-datastore-preferences -DATASTORE_PREFERENCES_POM_NAME=Ackee Security DataStore Preferences +DATASTORE_PREFERENCES_ARTIFACT_ID=guardian-datastore-preferences +DATASTORE_PREFERENCES_POM_NAME=Ackee Guardian DataStore Preferences DATASTORE_PREFERENCES_POM_YEAR=2024 -DATASTORE_PREFERENCES_POM_DESCRIPTION=DataStore Preferences artifact of the Ackee Security library. Contains encrypted preferences DataStore. +DATASTORE_PREFERENCES_POM_DESCRIPTION=DataStore Preferences artifact of the Ackee Guardian library. Contains encrypted preferences DataStore. # Jetpack artifact JETPACK_VERSION=1.0.0 -JETPACK_ARTIFACT_ID=security-jetpack -JETPACK_POM_NAME=Ackee Security Jetpack +JETPACK_ARTIFACT_ID=guardian-jetpack +JETPACK_POM_NAME=Ackee Guardian Jetpack JETPACK_POM_YEAR=2024 -JETPACK_POM_DESCRIPTION=Jetpack artifact of the Ackee Security library. Rewrite of the original Jetpack Security library from Google, which contains mainly fixes of synchronization bugs, but even other fixes together with API and performance improvements. +JETPACK_POM_DESCRIPTION=Jetpack artifact of the Ackee Guardian library. Rewrite of the original Jetpack Security library from Google, which contains mainly fixes of synchronization bugs, but even other fixes together with API and performance improvements. diff --git a/settings.gradle.kts b/settings.gradle.kts index c3b12db..6b6e43c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ dependencyResolutionManagement { enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -rootProject.name = "ackee-security" +rootProject.name = "ackee-guardian" includeBuild("build-logic") include(":app")