Skip to content

Commit

Permalink
Merge pull request #74 from storytellerF/master
Browse files Browse the repository at this point in the history
bump & add dontwarn proguard rules
  • Loading branch information
guillaume-tgl authored Feb 14, 2024
2 parents 210e3ef + 07503d2 commit d0af7ae
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 8 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ jobs:

steps:
- uses: actions/checkout@v1

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

- name: Run tests
run: ./gradlew lint test
43 changes: 36 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,37 +1,66 @@
buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:8.2.2'
}
}

repositories {
jcenter()
mavenCentral()
google()
}

apply plugin: 'com.android.library'
apply plugin: 'maven-publish'

android {
compileSdkVersion 30
compileSdk 34

defaultConfig {
minSdkVersion 15
consumerProguardFiles 'proguard-rules.pro'
}
namespace "com.thegrizzlylabs.sardineandroid"

def javaVersion = JavaVersion.VERSION_17
compileOptions {
sourceCompatibility javaVersion
targetCompatibility javaVersion
}
publishing {
singleVariant("release") {
withSourcesJar()
}
}
}

dependencies {
api 'com.squareup.okhttp3:okhttp:4.9.0'
api 'com.squareup.okhttp3:okhttp:4.12.0'

implementation ('org.simpleframework:simple-xml:2.7.1') {
implementation('org.simpleframework:simple-xml:2.7.1') {
exclude module: 'stax'
exclude module: 'stax-api'
exclude module: 'xpp3'
}

testImplementation 'junit:junit:4.13'
testImplementation 'junit:junit:4.13.2'
}
//fixme uncomment this for print deprecation info
//tasks.withType(JavaCompile) {
// options.compilerArgs =
// options.compilerArgs + ["-Xlint:deprecation", "-Xlint:unchecked"]
//}
afterEvaluate {
publishing {
publications {
release(MavenPublication) {
afterEvaluate {
from components.release
}
}
}
}
}
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-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk17
7 changes: 7 additions & 0 deletions proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@

## OkHTTP
-dontwarn okhttp3.internal.platform.ConscryptPlatform

-dontwarn org.simpleframework.xml.Element
-dontwarn org.simpleframework.xml.ElementList
-dontwarn org.simpleframework.xml.ElementListUnion
-dontwarn org.simpleframework.xml.Namespace
-dontwarn org.simpleframework.xml.Root
-dontwarn org.simpleframework.xml.convert.Converter

0 comments on commit d0af7ae

Please sign in to comment.