Skip to content

Commit 077ed2f

Browse files
Merge branch 'ks/UpdatingKtLint' into ks/UniversalResources
2 parents a987546 + 06bf60f commit 077ed2f

File tree

7 files changed

+22
-435
lines changed

7 files changed

+22
-435
lines changed

android/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ try {
1919
val releasePassword = properties.getProperty("releasePassword", "")
2020

2121
android {
22-
namespace = "co.touchlab.droidcon"
22+
namespace = "com.droidcon.app"
2323
compileSdk = libs.versions.compileSdk.get().toInt()
2424

2525
defaultConfig {
2626
applicationId = "com.droidcon.app"
2727
minSdk = libs.versions.minSdk.get().toInt()
2828
targetSdk = libs.versions.targetSdk.get().toInt()
29-
versionCode = 60107
30-
versionName = "6.1.7"
29+
versionCode = 10000
30+
versionName = "1.0.0"
3131
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3232
}
3333
packaging {

android/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
android:name="com.google.android.gms.permission.AD_ID"
1010
tools:node="remove" />
1111

12-
<queries>
13-
<package android:name="co.touchlab.fluttercon" />
14-
</queries>
15-
1612
<application
1713
android:icon="@mipmap/ic_launcher"
1814
android:label="@string/app_name"

android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import androidx.core.content.ContextCompat
2727
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
2828
import androidx.core.view.WindowCompat
2929
import androidx.lifecycle.lifecycleScope
30-
import co.touchlab.droidcon.R
30+
import com.droidcon.app.R
3131
import co.touchlab.droidcon.application.service.NotificationSchedulingService
3232
import co.touchlab.droidcon.domain.service.AnalyticsService
3333
import co.touchlab.droidcon.service.AndroidNotificationService

android/src/main/java/co/touchlab/droidcon/android/util/NotificationLocalizedStringFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package co.touchlab.droidcon.android.util
22

33
import android.content.Context
4-
import co.touchlab.droidcon.R
4+
import com.droidcon.app.R
55
import co.touchlab.droidcon.application.service.NotificationSchedulingService
66

77
class NotificationLocalizedStringFactory(private val context: Context) : NotificationSchedulingService.LocalizedStringFactory {

0 commit comments

Comments
 (0)