diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c9d6e22..98ebbec 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'gradle' - name: Grand execute permissions to gradlew @@ -33,11 +33,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'gradle' - name: Assemble app debug APK @@ -99,11 +99,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'gradle' - name: Version bump diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index aa4cdf1..f3476e6 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -12,11 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'gradle' - name: Grant execute permission for gradlew diff --git a/app/build.gradle b/app/build.gradle index 8188a6a..300b42d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,13 @@ plugins { } android { - compileSdkVersion 33 + namespace 'nl.jovmit.friends' + compileSdk 34 defaultConfig { applicationId "nl.jovmit.friends" minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -25,12 +26,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { @@ -38,7 +39,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.3.0" + kotlinCompilerExtensionVersion "1.5.0" } testOptions.unitTests.all { @@ -68,21 +69,21 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'com.google.android.material:material:1.9.0' implementation "androidx.compose.ui:ui:$composeVersion" implementation "androidx.compose.material:material:$composeVersion" implementation "androidx.compose.ui:ui-tooling:$composeVersion" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation "androidx.compose.runtime:runtime-livedata:$composeVersion" - implementation "androidx.navigation:navigation-compose:2.5.1" + implementation "androidx.navigation:navigation-compose:2.7.0" implementation "io.insert-koin:koin-android:$koinVersion" implementation "io.insert-koin:koin-androidx-compose:$koinVersion" implementation "com.google.accompanist:accompanist-swiperefresh:0.24.1-alpha" androidTestImplementation "androidx.compose.ui:ui-test-junit4:$composeVersion" - androidTestImplementation "androidx.test.ext:junit-ktx:1.1.3" + androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5" testImplementation "org.junit.jupiter:junit-jupiter-api:$jUnitVersion" testImplementation "org.junit.jupiter:junit-jupiter-params:$jUnitVersion" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3e2281c..b8feabf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - +