Merge pull request #31 from fgubler/Develop

Develop
fgubler · Nov 21, 2023 · 9e7dc98 · 9e7dc98
2 parents b1d7a7b + 7a8e0b7
commit 9e7dc98
Show file tree

Hide file tree

Showing 126 changed files with 3,490 additions and 579 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -2,9 +2,9 @@ name: Android CI
 
 on:
   push:
-    branches: [ Develop, master ]
+    branches: [ master ]
   pull_request:
-    branches: [ Develop, master ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -13,11 +13,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: '17'
+        distribution: 'zulu'
         cache: gradle
 
     - name: Grant execute permission for gradlew

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "Develop" ]
+    branches: [ "master" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "Develop" ]
+    branches: [ "master" ]
   schedule:
     - cron: '36 17 * * 2'
 
@@ -42,6 +42,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - uses: actions/setup-java@v3
+      with:
+        java-version: 17
+        distribution: zulu
+        cache: gradle
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/app/build.gradle b/app/build.gradle
@@ -25,14 +25,14 @@ ktlint {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ch.abwesend.privatecontacts"
         minSdk 24
-        targetSdk 33
-        versionCode 42
-        versionName "2.7.0"
+        targetSdk 34
+        versionCode 45
+        versionName "3.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -54,12 +54,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
 //        useIR = true // gradle build fails with this option set to true...
     }
     buildFeatures {
@@ -87,9 +87,9 @@ dependencies {
 
 
     // Android Core
-    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "com.google.android.material:material:1.8.0"
+    implementation "com.google.android.material:material:1.10.0"
 
     // Android Lifecycle
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:${androidLifecycleVersion}"
@@ -105,8 +105,8 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview:${composeVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     debugImplementation "androidx.compose.ui:ui-tooling:${composeVersion}"
-    implementation "androidx.activity:activity-compose:1.6.1"
-    implementation "androidx.navigation:navigation-compose:2.5.3"
+    implementation "androidx.activity:activity-compose:1.8.1"
+    implementation "androidx.navigation:navigation-compose:2.7.5"
     implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
 
     // Firebase
@@ -122,7 +122,7 @@ dependencies {
     // Others
     implementation "androidx.datastore:datastore-preferences:1.0.0"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation "io.insert-koin:koin-core:$koinVersion"
     implementation "io.insert-koin:koin-android:${koinVersion}"