Skip to content

Commit

Permalink
Regular Project Update
Browse files Browse the repository at this point in the history
  • Loading branch information
mitrejcevski committed Aug 20, 2023
1 parent e4f93d2 commit f3f86ee
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 29 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 13 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -25,20 +26,20 @@ 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 {
compose true
}

composeOptions {
kotlinCompilerExtensionVersion "1.3.0"
kotlinCompilerExtensionVersion "1.5.0"
}

testOptions.unitTests.all {
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nl.jovmit.friends">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:name=".app.FriendsApplication"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
buildscript {
ext {
kotlinVersion = '1.7.10'
composeVersion = '1.2.1'
kotlinVersion = '1.9.0'
composeVersion = '1.5.0'
koinVersion = '3.1.4'
jUnitVersion = '5.8.2'
jUnitVersion = '5.9.2'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Feb 06 00:40:28 CET 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion whatsNewDirectory/whatsnew-en-US
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The second release
Updating project dependencies and target OS versions.

0 comments on commit f3f86ee

Please sign in to comment.