Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
akshaaatt committed Oct 5, 2023
1 parent 42b9638 commit f8d59bf
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 29 deletions.
38 changes: 25 additions & 13 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,31 @@ on:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- uses: actions/checkout@v4

- name: set up JDK
uses: actions/setup-java@v3
with:
distribution: 'oracle'
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run unit tests
run: ./gradlew test

- name: Build with Gradle
run: ./gradlew build

- name: Run lint with Gradle
run: ./gradlew lint

- name: Check lint results
uses: yutailang0119/action-android-lint@v3
with:
report-path: build/reports/*.xml
continue-on-error: false
16 changes: 12 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ plugins {
}

android {
compileSdk 33
namespace 'com.limurse.onboarding'

compileSdk 34
defaultConfig {
applicationId "com.limurse.onboarding"
minSdk 17
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"
}
Expand All @@ -18,12 +20,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
namespace 'com.limurse.onboarding'

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
}

dependencies {
implementation project(':onboard')

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.10.1'
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildscript {
ext {
kotlin_version = '1.8.20'
kotlin_version = '1.9.10'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 26 21:28:17 IST 2021
#Thu Oct 05 13:53:12 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
25 changes: 17 additions & 8 deletions onboard/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,35 @@ plugins {
}

android {
compileSdk 33
namespace 'com.limurse.onboard'

compileSdk 34
defaultConfig {
minSdk 17
targetSdk 33
targetSdk 34

consumerProguardFiles 'consumer-proguard-rules.pro'
vectorDrawables.useSupportLibrary = true
}
namespace 'com.limurse.onboard'

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.annotation:annotation:1.6.0'
implementation 'com.airbnb.android:lottie:6.0.0'
implementation 'androidx.annotation:annotation:1.7.0'
implementation 'com.airbnb.android:lottie:6.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.gms:play-services-base:18.2.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'org.mockito:mockito-core:5.5.0'
}

afterEvaluate {
Expand All @@ -38,7 +47,7 @@ afterEvaluate {
// You can then customize attributes of the publication as shown below.
groupId = 'com.limurse'
artifactId = 'Omboard'
version = '1.0.4'
version = '1.1.0'
}
}
}
Expand Down

0 comments on commit f8d59bf

Please sign in to comment.