Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 206710de authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch 'upstream' into 'epic_176-all-refactorAndGplay' 

Revert "App lounge: Update gradle and other deps"

See merge request ecorp/apps/apps!22
parents beda2f6e eb8c21ea

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ dependencies { 
    implementation "com.squareup.okhttp3:okhttp:4.9.2"



    // Navigation Components

    def navigation_version = "2.4.1"

    def navigation_version = "2.3.5"

    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"

    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
@@ -129,7 +129,7 @@ dependencies { 
    implementation "com.google.dagger:hilt-android:$hilt_version"



    // Lifecycle Components

    def lifecycle_version = "2.4.1"

    def lifecycle_version = "2.4.0"

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) { 
            )

        }



        val startDestination = findNavController().graph.startDestinationId

        val startDestination = findNavController().graph.startDestination

        if (startDestination == R.id.applicationFragment) {

            binding.toolbar.setNavigationOnClickListener {

                val action = ApplicationFragmentDirections.actionApplicationFragmentToHomeFragment()

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ buildscript { 
        mavenCentral()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:7.1.1'

        classpath 'com.android.tools.build:gradle:7.1.0'

        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'

        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1"

        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"

        classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.5"



        // NOTE: Do not place your application dependencies here; they belong