Skip to content

Commit 42a2b37

Browse files
authored
Merge branch 'main' into amjiao-patch-1
2 parents 0a23820 + 52f1497 commit 42a2b37

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/android-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
java-version: '17'
2323
distribution: 'temurin'
2424
cache: gradle
25-
25+
2626
- name: Create google-services.json
2727
run: |
28-
echo "${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" | base64 --decode > app/google-services.json
28+
echo "${{ secrets.GOOGLE_SERVICES_JSON_NEW }}" | base64 --decode > app/google-services.json
2929
3030
- name: Run Lint
3131
run: ./gradlew lint

app/src/main/java/com/cornellappdev/score/MainActivity.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ import androidx.activity.compose.setContent
55
import androidx.activity.enableEdgeToEdge
66
import androidx.appcompat.app.AppCompatActivity
77
import com.cornellappdev.score.nav.root.RootNavigation
8+
import com.google.firebase.Firebase
9+
import com.google.firebase.analytics.FirebaseAnalytics
10+
import com.google.firebase.analytics.analytics
811
import dagger.hilt.android.AndroidEntryPoint
912

13+
private lateinit var firebaseAnalytics: FirebaseAnalytics
14+
1015
@AndroidEntryPoint
1116
class MainActivity : AppCompatActivity() {
1217
override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,5 +20,6 @@ class MainActivity : AppCompatActivity() {
1520
setContent {
1621
RootNavigation()
1722
}
23+
firebaseAnalytics = Firebase.analytics
1824
}
1925
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ plugins {
66
kotlin("jvm") version "2.0.20"
77
kotlin("plugin.serialization") version "2.0.20"
88
id("com.google.gms.google-services") version "4.4.3" apply false
9-
}
9+
}

0 commit comments

Comments
 (0)