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

Unverified Commit 3576da12 authored by Arnau Mora's avatar Arnau Mora Committed by GitHub
Browse files

Update to AGP 8.0 (#152) 



* Updated wrapper version

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated AGP

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated Kotlin

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated KSP

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated to Java 17

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated dependencies

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated own dependencies

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Annotated `getWithCredentialsByIdLive` with `@Transaction`

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Migrated LiveData map method

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Removed `jvmTarget`

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Enabled `buildConfig` feature

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Updated missing Java version to 17

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>

* Update Room, remove unnecessary @Transaction

---------

Signed-off-by: default avatarArnau Mora Gras <arnyminerz@proton.me>
Co-authored-by: default avatarRicki Hirner <hirner@bitfire.at>
parent 8d7fac17

.github/workflows/codeql.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ jobs: 
    - uses: actions/setup-java@v2

      with:

        distribution: 'temurin'

        java-version: 11

        java-version: 17

        cache: 'gradle'

    - uses: gradle/wrapper-validation-action@v1

.github/workflows/release.yml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ jobs: 
      - uses: actions/setup-java@v2

        with:

          distribution: 'temurin'

          java-version: 11

          java-version: 17

          cache: 'gradle'

      - uses: gradle/wrapper-validation-action@v1

.github/workflows/test-dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ jobs: 
      - uses: actions/setup-java@v2

        with:

          distribution: 'temurin'

          java-version: 11

          java-version: 17

      - uses: gradle/gradle-build-action@v2



      - name: Check
@@ -37,7 +37,7 @@ jobs: 
      - uses: actions/setup-java@v2

        with:

          distribution: 'temurin'

          java-version: 11

          java-version: 17

      - uses: gradle/gradle-build-action@v2



      - name: Enable KVM group perms

app/build.gradle

+9 −11
Original line number Diff line number Diff line
@@ -31,14 +31,12 @@ android { 
    compileOptions {

        coreLibraryDesugaringEnabled true



        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

    kotlinOptions {

        jvmTarget = "1.8"

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }



    buildFeatures {

        buildConfig = true

        viewBinding = true

        dataBinding = true

    }
@@ -82,19 +80,19 @@ android { 


dependencies {

    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'



    implementation project(':cert4android')

    implementation project(':ical4android')



    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.core:core-ktx:1.9.0'

    implementation 'androidx.fragment:fragment-ktx:1.5.5'

    implementation 'androidx.core:core-ktx:1.10.0'

    implementation 'androidx.fragment:fragment-ktx:1.5.7'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.work:work-runtime-ktx:2.8.0'

    implementation 'androidx.work:work-runtime-ktx:2.8.1'

    implementation 'com.google.android.material:material:1.8.0'



    implementation 'com.jaredrummler:colorpicker:1.1.0'
@@ -120,7 +118,7 @@ dependencies { 
    androidTestImplementation "androidx.arch.core:core-testing:2.2.0"

    androidTestImplementation 'junit:junit:4.13.2'

    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

    androidTestImplementation "androidx.work:work-testing:2.8.0"

    androidTestImplementation "androidx.work:work-testing:2.8.1"



    testImplementation 'junit:junit:4.13.2'

}
 
 No newline at end of file

app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.databinding.DataBindingUtil 
import androidx.fragment.app.Fragment

import androidx.fragment.app.FragmentManager

import androidx.lifecycle.AndroidViewModel

import androidx.lifecycle.Transformations

import androidx.lifecycle.map

import androidx.recyclerview.widget.DiffUtil

import androidx.recyclerview.widget.ListAdapter

import androidx.recyclerview.widget.RecyclerView
@@ -283,7 +283,7 @@ class CalendarListActivity: AppCompatActivity(), SwipeRefreshLayout.OnRefreshLis 
    class SubscriptionsModel(application: Application): AndroidViewModel(application) {



        /** whether there are running sync workers */

        val isRefreshing = Transformations.map(SyncWorker.liveStatus(application)) { workInfos ->

        val isRefreshing = SyncWorker.liveStatus(application).map { workInfos ->

            workInfos.any { it.state == WorkInfo.State.RUNNING }

        }