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

Unverified Commit 03c4bea3 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dependencies, use cert4android from jitpack (instead of a submodule)

parent a83d9c7b

.gitmodules

+0 −3
Original line number Diff line number Diff line 
[submodule "ical4android"]

	path = ical4android

	url = ../ical4android.git
 
[submodule "cert4android"]

	path = cert4android

	url = ../cert4android.git

app/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ dependencies { 
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'

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



    implementation project(':cert4android')

    implementation 'com.github.bitfireAT:cert4android:3817e62d9f173d8f8b800d24769f42cb205f560e'

    implementation project(':ical4android')



    implementation 'androidx.activity:activity-compose:1.7.1'

    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.cardview:cardview:1.0.0'

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

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

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

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

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
@@ -115,7 +115,7 @@ dependencies { 
    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"

    implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}"

    implementation "com.squareup.okhttp3:okhttp-coroutines:${versions.okhttp}"

    implementation "joda-time:joda-time:2.12.1"

    implementation "joda-time:joda-time:2.12.5"



    // latest commons that don't require Java 8

    //noinspection GradleDependency

build.gradle

+3 −4
Original line number Diff line number Diff line 
buildscript {

    ext.versions = [

        aboutLibs: '10.6.3',

        aboutLibs: '10.7.0',

        composeBom: '2023.05.01',   // https://developer.android.com/jetpack/compose/bom

        kotlin: '1.8.21',           // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion

        ksp: '1.0.11',
@@ -10,10 +10,8 @@ buildscript { 


    repositories {

        google()

        maven {

            url "https://plugins.gradle.org/m2/"

        }

        mavenCentral()

        maven { url "https://plugins.gradle.org/m2/" }

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:8.0.1'
@@ -27,5 +25,6 @@ allprojects { 
    repositories {

        google()

        mavenCentral()

        maven { url "https://jitpack.io" }

    }

}
 
 No newline at end of file

cert4android @ 53503d8c

Compare 53503d8c to 53503d8c
Original line number Diff line number Diff line 
Subproject commit 53503d8c258687ffb36625630bb5a4d8ff07bd89