Skip to content
Merged
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
9 changes: 5 additions & 4 deletions .github/workflows/deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
if: ${{ !contains(github.event.head_commit.message, 'Prepare for release') }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6

- name: Cache Gradle Files
uses: actions/cache@v2
uses: actions/cache@v5
with:
path: |
~/.gradle/caches/
Expand All @@ -21,9 +21,10 @@ jobs:
${{ runner.os }}-gradle-

- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v5
with:
java-version: 1.8
distribution: 'temurin'
java-version: 17

- name: Build
run: ./gradlew build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6
- uses: gradle/wrapper-validation-action@v1
4 changes: 2 additions & 2 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v6

- name: Cache Gradle Files
uses: actions/cache@v2
uses: actions/cache@v5
with:
path: |
~/.gradle/caches/
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/publish-maven-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6

- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v5
with:
java-version: 1.8
distribution: 'temurin'
java-version: 17

- name: Build
run: ./gradlew build
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildscript {
ext.kotlinVersion = '1.4.30'
ext.kotlinVersion = '1.8.22'

repositories {
google()
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ org.gradle.parallel=true

GROUP_ID=com.linkedin.dextestparser
VERSION_NAME=2.3.5-SNAPSHOT
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions parser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ plugins {
id 'maven-publish'
id 'signing'
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.dokka' version '1.4.32'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'org.jetbrains.dokka' version '1.8.20'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}

mainClassName = 'com.linkedin.dex.parser.DexParser'

task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
classifier 'javadoc'
archiveClassifier = 'javadoc'
from dokkaJavadoc.outputDirectory
}

Expand All @@ -27,9 +27,9 @@ repositories {

dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "com.github.ajalt.clikt:clikt:3.1.0"
implementation "com.github.ajalt.clikt:clikt:3.5.2"

testImplementation 'junit:junit:4.13.1'
testImplementation 'junit:junit:4.13.2'
}

task testParsing(dependsOn: ':test-app:assembleDebugAndroidTest', type: JavaExec) {
Expand Down