Skip to content

Commit

Permalink
Update dependencies, Gradle, JDK (#17)
Browse files Browse the repository at this point in the history
* Update lib and app dependencies

* Update to Gradle 8 and JDK 17

* Improve gradle properties

* Use truncated gradle SDK attributes

* Update workflow JDK

* Use newer way of declaring gradle tasks

* Update to agp 8.1.0

* Replace deprecated 'apply plugin' statements
  • Loading branch information
cyb3rko authored Nov 21, 2023
1 parent d01b3e1 commit a853f35
Show file tree
Hide file tree
Showing 11 changed files with 270 additions and 166 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: "11"
java-version: "17"
distribution: "temurin"
cache: gradle
- name: Build (debug) with Gradle
Expand Down
22 changes: 14 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
plugins {
id 'com.android.application'
id 'kotlin-android'
}

android {
compileSdkVersion project.ext.compileSdkVersion
namespace 'com.lambdapioneer.argon2kt.app'
compileSdk project.ext.compileSdkVersion

defaultConfig {
applicationId "com.lambdapioneer.argon2kt.app"

minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
minSdk project.ext.minSdkVersion
targetSdk project.ext.targetSdkVersion

versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -42,16 +45,19 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}
}

dependencies {
implementation project(":lib")
// implementation 'com.lambdapioneer.argon2kt:argon2kt:1.4.0'

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.core:core-ktx:$ktx_version"
implementation 'androidx.multidex:multidex:2.0.1'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" package="com.lambdapioneer.argon2kt.app">
xmlns:tools="http://schemas.android.com/tools">

<application
android:name="androidx.multidex.MultiDexApplication"
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ buildscript {
ext {
appcompat_version = '1.6.1'
espresso_version = '3.5.1'
agp_version = '7.2.0'
jassert_version = '3.11.1'
agp_version = '8.1.0'
jassert_version = '3.24.2'
junit_version = '4.13.2'
kotlin_version = '1.8.0'
ktx_version = '1.9.0'
roboelectric_version = '4.3'
kotlin_version = '1.8.21'
ktx_version = '1.10.1'
roboelectric_version = '4.10.3'
testrunner_version = '1.5.2'

// for maven central upload and publishing
Expand Down Expand Up @@ -44,6 +44,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
6 changes: 5 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Default Android/Gradle/Kotlin project settings
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
kotlin.code.style=official
org.gradle.unsafe.configuration-cache=true
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=true

# Maven release configuration
GROUP=com.lambdapioneer.argon2kt
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Dec 14 17:00:58 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distrubutionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
Loading

0 comments on commit a853f35

Please sign in to comment.