Merge branch 'main' into enable_TYPESAFE_PROJECT_ACCESSORS

.editorconfig

@@ -0,0 +1,24 @@
+root = true
+
+[*.{kt,kts}]
+end_of_line = lf
+ij_kotlin_packages_to_use_import_on_demand = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_imports_layout = *
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+parameter-list-wrapping = true
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
+ktlint_code_style = android_studio
+ktlint_enum_entry_name_casing = upper_or_camel_cases
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_function_signature_body_expression_wrapping = default
+ktlint_ignore_back_ticked_identifier = false
+max_line_length = 140
+
+

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: Build
+on:
+  pull_request:
+  push:
+    branches: [ main ] # Trigger on pushes to the main branch
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Check, Assemble Android and compile iOS
+        run: ./gradlew ktlintCheck assembleDebug compileKotlinIosX64 --no-daemon

.github/workflows/gradle-wrapper.yaml

@@ -0,0 +1,15 @@
+name: gradle-wrapper
+
+on:
+  pull_request:
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/**'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v4

.gitignore

@@ -38,17 +38,7 @@ captures/
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/encodings.xml
-.idea/saveactions_settings.xml
-.idea/deploymentTargetDropDown.xml
-.idea/gradle.xml
-.idea/misc.xml
+
 .DS_Store
 /build
 /captures
@@ -87,8 +77,14 @@ GoogleService-Info.plist
 GoogleService-Info.plist
 Pods/
 *.xcworkspace
-.idea/inspectionProfiles/profiles_settings.xml
-.idea/inspectionProfiles/Project_Default.xml
-.idea/dictionaries/matyas.xml
-/.idea/
 .kotlin
+.idea/.name
+.idea/compiler.xml
+.idea/deploymentTargetSelector.xml
+.idea/gradle.xml
+.idea/kotlinc.xml
+.idea/misc.xml
+.idea/runConfigurations.xml
+.idea/vcs.xml
+.idea/workspace.xml
+.idea/caches/deviceStreaming.xml

README.md

@@ -7,7 +7,7 @@ This project has a pair of native mobile applications backed by the Sessionize d
 > ## Subscribe!
 >
 > We build solutions that get teams started smoothly with Kotlin Multiplatform and ensure their success in production. Join our community to learn how your peers are adopting KMM.
-[Sign up here](https://form.typeform.com/to/MJTpmm?typeform-source=touchlab.co)!
+[Sign up here](https://touchlab.co/?s=shownewsletter)!
 
 ## Building
 

android/build.gradle.kts

@@ -5,6 +5,8 @@ plugins {
     kotlin("android")
     alias(libs.plugins.googleServices)
     alias(libs.plugins.crashlytics)
+    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.composeCompiler)
 }
 val releaseEnabled = file("./release.jks").exists()
 
@@ -24,8 +26,8 @@ android {
         applicationId = "co.touchlab.droidcon.london"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 20201
-        versionName = "2.2.0"
+        versionCode = 60107
+        versionName = "6.1.7"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     packaging {
@@ -63,9 +65,6 @@ android {
         abortOnError = false
     }
 
-    buildFeatures {
-        compose = true
-    }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
@@ -88,10 +87,18 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.messaging)
 
     implementation(libs.hyperdrive.multiplatformx.api)
 
     implementation(libs.bundles.androidx.compose)
 
     coreLibraryDesugaring(libs.android.desugar)
 }
+
+// Function that copies `mock` JSON config file for google-services if there isn't one available
+// Google-services plugin requires this config file to build
+val googleServices = file("google-services.json")
+if (!googleServices.exists()) {
+    file("mock-google-services.json").copyTo(googleServices, overwrite = false)
+}

android/mock-google-services.json

@@ -0,0 +1,47 @@
+{
+  "project_info": {
+    "project_number": "606665771234",
+    "project_id": "mock-firebase-project",
+    "storage_bucket": "mock-firebase-project.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:606665771229:android:c1f0f09aa42abc12",
+        "android_client_info": {
+          "package_name": "co.touchlab.droidcon.london"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "123455771229-sc9bpuefbjceq7i1qabk7gssstefrdlv.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "co.touchlab.droidcon.london",
+            "certificate_hash": "7f254b538565cfe6c28a88744985f015b1534980"
+          }
+        },
+        {
+          "client_id": "123455771229-sc9bpuefbjceq7i1qabk7gssstefrdlv.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCNzhU2a9gMc_JHurHbywOrRI9Vj4VQZZZ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "413392989754-04u9tv32474rj0pmbfksirt4ti02a64r.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/src/main/AndroidManifest.xml

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <uses-permission
+        android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove" />
+
+    <queries>
+        <package android:name="co.touchlab.fluttercon" />
+    </queries>
 
     <application
         android:icon="@mipmap/ic_launcher"
@@ -32,6 +40,16 @@
             </intent-filter>
         </receiver>
 
-        <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
+
+        <service
+            android:name="co.touchlab.droidcon.android.service.impl.DefaultFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 </manifest>