Fix module packagename

This commit is contained in:
darken
2022-09-14 18:00:18 +02:00
committed by Matthias Urhahn
parent 33172a7aee
commit 26da600761
15 changed files with 20 additions and 15 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="eu.darken.capod">
<manifest package="eu.darken.capod.common">
</manifest>
@@ -1,7 +1,5 @@
package eu.darken.capod.common
import eu.darken.capod.BuildConfig
// Can't be const because that prevents them from being mocked in tests
@Suppress("MayBeConstant")
@@ -3,7 +3,7 @@ package eu.darken.capod.common.bluetooth
import androidx.annotation.StringRes
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import eu.darken.capod.R
import eu.darken.capod.common.R
@JsonClass(generateAdapter = false)
enum class ScannerMode(
@@ -1,7 +1,7 @@
package eu.darken.capod.common.error
import android.content.Context
import eu.darken.capod.R
import eu.darken.capod.common.R
interface HasLocalizedError {
fun getLocalizedError(context: Context): LocalizedError
@@ -6,8 +6,8 @@ import android.os.Build
import android.os.PowerManager
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import eu.darken.capod.R
import eu.darken.capod.common.BuildConfigWrap
import eu.darken.capod.common.R
import eu.darken.capod.common.withinApiLevel
enum class Permission(
@@ -3,7 +3,7 @@ package eu.darken.capod.main.core
import androidx.annotation.StringRes
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import eu.darken.capod.R
import eu.darken.capod.common.R
@JsonClass(generateAdapter = false)
enum class MonitorMode(
@@ -4,7 +4,7 @@ import android.content.Context
import androidx.annotation.DrawableRes
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import eu.darken.capod.R
import eu.darken.capod.common.R
import eu.darken.capod.common.bluetooth.BleScanResult
import java.time.Instant
import java.util.*
@@ -3,7 +3,7 @@ package eu.darken.capod.pods.core
import android.content.Context
import android.icu.text.RelativeDateTimeFormatter
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.R
import java.time.Duration
import java.time.Instant
import kotlin.math.roundToInt
@@ -2,7 +2,7 @@ package eu.darken.capod.pods.core.apple
import android.content.Context
import androidx.annotation.StringRes
import eu.darken.capod.R
import eu.darken.capod.common.R
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.isBitSet
import eu.darken.capod.common.lowerNibble
@@ -1,7 +1,7 @@
package eu.darken.capod.pods.core.apple.misc
import android.content.Context
import eu.darken.capod.R
import eu.darken.capod.common.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.PodDevice
@@ -1,7 +1,7 @@
package eu.darken.capod.pods.core.unknown
import android.content.Context
import eu.darken.capod.R
import eu.darken.capod.common.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.PodDevice
@@ -3,7 +3,7 @@ package eu.darken.capod.reaction.core.autoconnect
import androidx.annotation.StringRes
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import eu.darken.capod.R
import eu.darken.capod.common.R
@JsonClass(generateAdapter = false)
enum class AutoConnectCondition(
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
}
apply(plugin = "dagger.hilt.android.plugin")
apply(plugin = "androidx.navigation.safeargs.kotlin")
apply(plugin = "com.bugsnag.android.gradle")
//apply(plugin = "com.bugsnag.android.gradle")
android {
compileSdk = ProjectConfig.compileSdk
+4
View File
@@ -59,6 +59,10 @@
android:name="androidx.startup.InitializationProvider"
android:authorities="${applicationId}.androidx-startup"
tools:node="remove" />
<meta-data
android:name="com.bugsnag.android.API_KEY"
android:value="${bugsnagApiKey}" />
</application>
</manifest>
+4 -1
View File
@@ -118,5 +118,8 @@ fun getBugSnagApiKey(
propertiesPath?.takeIf { it.canRead() }?.let { load(FileInputStream(it)) }
}
return System.getenv("BUGSNAG_API_KEY") ?: bugsnagProps.getProperty("bugsnag.apikey")
val key = System.getenv("BUGSNAG_API_KEY") ?: bugsnagProps.getProperty("bugsnag.apikey")
println("Using key = $key")
return key
}