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

update dependencies #95

Merged
merged 2 commits into from Feb 7, 2022
Merged
Changes from 1 commit
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
Next Next commit
update dependencies
Hristijan committed Feb 3, 2022
commit 7e4cd1628c78450a90a4c2662c02f79909bc19f0
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:7.1.0'
}
}

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

android.useAndroidX=true
android.enableJetifier=true
android.jetifier.blacklist=poishadow-all.jar
android.jetifier.ignorelist=poishadow-all.jar
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
1 change: 1 addition & 0 deletions poishadow/build.gradle
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ dependencies {
implementation 'org.apache.poi:poi-ooxml:4.1.2'
implementation 'com.fasterxml:aalto-xml:1.3.0'
implementation 'stax:stax-api:1.0.1'
implementation 'org.apache.poi:poi-scratchpad:4.1.2'
}

shadowJar {
28 changes: 9 additions & 19 deletions poitest/build.gradle
Original file line number Diff line number Diff line change
@@ -36,8 +36,7 @@ dependencies {
preBuild.dependsOn ':poishadow:shadowJar'

android {
compileSdkVersion 31
buildToolsVersion '29.0.3'
compileSdkVersion 32

compileOptions {
coreLibraryDesugaringEnabled true
@@ -48,7 +47,7 @@ android {
defaultConfig {
applicationId 'org.dstadler.poiandroidtest.poitest'
minSdkVersion 26
targetSdkVersion 31
targetSdkVersion 32
versionCode 3
versionName '4.1.2'

@@ -69,24 +68,15 @@ android {
signingConfig signingConfigs.debug
}
}

lintOptions {
// There are restricted packages used in some of POI code, e.g. java.awt or javax.imageio
// I could not exclude these in the
abortOnError false
packagingOptions {
resources {
pickFirsts += ['META-INF/DEPENDENCIES.txt', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/DEPENDENCIES', 'META-INF/notice.txt', 'META-INF/license.txt', 'META-INF/dependencies.txt', 'META-INF/LGPL2.1']
}
}


// error about duplicates if some of these are not excluded
packagingOptions {
pickFirst 'META-INF/DEPENDENCIES.txt'
pickFirst 'META-INF/LICENSE.txt'
pickFirst 'META-INF/NOTICE.txt'
pickFirst 'META-INF/NOTICE'
pickFirst 'META-INF/LICENSE'
pickFirst 'META-INF/DEPENDENCIES'
pickFirst 'META-INF/notice.txt'
pickFirst 'META-INF/license.txt'
pickFirst 'META-INF/dependencies.txt'
pickFirst 'META-INF/LGPL2.1'
lint {
abortOnError false
}
}