kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate namespaces to Gradle (#1805)

Browse source 
* ui-compose: update Gradle configuration

* gradle: fix namespace for a couple astray Compose dependencies

* all: switch to Gradle namespace property

Mirrors a similar change from AndroidX dcfa035a96
This commit is contained in:
Harsh Shandilya 2022-03-27 18:07:18 +05:30 committed by GitHub
parent 4d3be5b070
commit 2320201f89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -35,6 +35,8 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
namespace = "dev.msfjarvis.aps"
lint {
abortOnError = true
checkReleaseBuilds = false

1
app/src/main/AndroidManifest.xml
View file

@ -5,7 +5,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="dev.msfjarvis.aps"
android:installLocation="auto">
<uses-permission android:name="android.permission.INTERNET" />

1
autofill-parser/build.gradle.kts
View file

@ -13,6 +13,7 @@ plugins {
android {
defaultConfig { consumerProguardFiles("consumer-rules.pro") }
sourceSets { getByName("test") { resources.srcDir("src/main/assets") } }
namespace = "com.github.androidpasswordstore.autofillparser"
}
dependencies {

2
autofill-parser/src/main/AndroidManifest.xml
View file

@ -3,4 +3,4 @@
~ SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-->
<manifest package="com.github.androidpasswordstore.autofillparser"></manifest>
<manifest />

4
gradle/libs.versions.toml
View file

@ -21,12 +21,10 @@ androidx-annotation = "androidx.annotation:annotation:1.3.0"
androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"
androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
androidx-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha08"
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.3"
androidx-core-ktx = "androidx.core:core-ktx:1.8.0-alpha06"
androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.1"
androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0"
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
@ -61,7 +59,9 @@ compose-animation = { module = "androidx.compose.animation:animation", version.r
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose" }
compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha08"
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }

2
openpgp-ktx/build.gradle.kts
View file

@ -11,8 +11,8 @@ plugins {
android {
defaultConfig { consumerProguardFiles("consumer-proguard-rules.pro") }
buildFeatures.aidl = true
namespace = "me.msfjarvis.openpgpktx"
}
dependencies { implementation(libs.kotlin.coroutines.core) }

2
openpgp-ktx/src/main/AndroidManifest.xml
View file

@ -3,4 +3,4 @@
~ SPDX-License-Identifier: Apache-2.0
-->
<manifest package="me.msfjarvis.openpgpktx" />
<manifest />

5
passgen/diceware/build.gradle.kts
View file

@ -9,7 +9,10 @@ plugins {
id("com.github.android-password-store.kotlin-library")
}
android { sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } } }
android {
sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
namespace = "dev.msfjarvis.aps.passgen.diceware"
}
dependencies {
implementation(libs.dagger.hilt.core)

2
passgen/diceware/src/main/AndroidManifest.xml
View file

@ -3,4 +3,4 @@
~ SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-->
<manifest package="dev.msfjarvis.aps.passgen.diceware" />
<manifest />

27
ui-compose/build.gradle.kts
View file

@ -4,14 +4,21 @@ plugins {
id("com.github.android-password-store.kotlin-library")
}
dependencies {
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.hilt.compose)
implementation(libs.compose.foundation.core)
implementation(libs.compose.foundation.layout)
implementation(libs.compose.material)
implementation(libs.androidx.compose.material3)
implementation(libs.compose.ui.core)
implementation(libs.compose.ui.viewbinding)
compileOnly(libs.compose.ui.tooling)
android {
buildFeatures {
compose = true
composeOptions {
useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.versions.compose.get()
}
}
namespace = "dev.msfjarvis.aps.ui.compose"
}
dependencies {
api(libs.compose.foundation.core)
api(libs.compose.foundation.layout)
api(libs.compose.material)
api(libs.compose.material3)
api(libs.compose.ui.core)
}

2
ui-compose/src/main/AndroidManifest.xml
View file

@ -3,4 +3,4 @@
~ SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-->
<manifest package="dev.msfjarvis.aps.ui.compose" />
<manifest />