Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gradle and API upgrade #104

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
PACKAGE_TYPE: "aar"
GRADLE_VERSION: "7.5"
GRADLE_VERSION: "8.4"
JAVA_VERSION: "17"
ARTIFACT_PATH: "VCL/build/outputs"
ANDROID_NEXUS_SIGNING_KEY_ID: ${{ secrets.ANDROID_NEXUS_SIGNING_KEY_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

env:
PACKAGE_TYPE: "aar"
GRADLE_VERSION: "7.5"
GRADLE_VERSION: "8.4"
JAVA_VERSION: "17"
ARTIFACT_PATH: "VCL/build/outputs"
GLOBAL_ENV: ${{ github.event_name == 'push' && format('{0}', 'dev') || inputs.environment }}
Expand Down
14 changes: 9 additions & 5 deletions VCL/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ plugins {
}

android {
compileSdk 33
compileSdk 34
// buildToolsVersion "30.0.3"
namespace 'io.velocitycareerlabs'

defaultConfig {
minSdk 24
targetSdk 33
targetSdk 34
versionName "2.4.2"
versionCode 137
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -63,6 +63,10 @@ android {
unitTests.includeAndroidResources = true
unitTests.returnDefaultValues = true
}

buildFeatures {
buildConfig true
}
}

java {
Expand All @@ -83,7 +87,7 @@ def getGroupId = { ->
return 'io.velocitycareerlabs'
}

tasks.register('androidSourcesJar', Jar) {
task androidSourcesJar(type: Jar) {
archiveClassifier.set('sources')
if (project.plugins.findPlugin("com.android.library")) {
// For Android libraries
Expand Down Expand Up @@ -216,7 +220,7 @@ repositories {
*/

dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.12.0'

implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
//noinspection GradleDependency
Expand All @@ -235,7 +239,7 @@ dependencies {
testImplementation "org.mockito:mockito-inline:5.2.0"
// Required -- JSON framework
testImplementation 'org.json:json:20240303'
// jsonassert
// json assert
testImplementation 'org.skyscreamer:jsonassert:1.5.1'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ plugins {
}

android {
compileSdk 33
compileSdk 34
// buildToolsVersion "30.0.3"

defaultConfig {
applicationId "com.vcl.wallet"
minSdk 24
targetSdk 33
targetSdk 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -43,9 +43,9 @@ android {
}

dependencies {
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.9.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.7.21"
ext.kotlin_version = "1.9.20"
// Set "rc" suffix for VCL SDK release candidate
ext.rcSuffix = "rc"
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -19,23 +19,22 @@ buildscript {
plugins {
// Automation plugin
// https://github.com/gradle-nexus/publish-plugin
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
}

// Publishing scripts
apply from: "${rootDir}/publish-core.gradle"


allprojects {
repositories {
google()
mavenCentral()
maven {
url "$buildDir/VCL"
url "${getLayout().getBuildDirectory()}/VCL"
}
}
}

task clean(type: Delete) {
delete rootProject.buildDir
delete rootProject.getLayout().getBuildDirectory()
}
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ android.enableJetifier=true
kotlin.code.style=official
#android.enableR8=true
#android.enableD8=true
android.disableAutomaticComponentCreation=true
#android.disableAutomaticComponentCreation=true
#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
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip