Skip to content

Commit

Permalink
Merge pull request #13 from transloadit/Update_Dependencies_And_Fix_V…
Browse files Browse the repository at this point in the history
…ulnerabilities

Update To recent Versions
  • Loading branch information
cdr-chakotay committed Oct 30, 2022
2 parents 97e8591 + 439b314 commit 850cb5a
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 0.0.7 / 2022-10-30 ###
* Updated dependency for Transloadit Java SDK to 0.4.4 => includes Socket-IO 4 and a security patch
* Updated to androidx.appcompat:appcompat:1.5.1
* Set compileSdkVersion to 31, and targetSdkVersion 31

### 0.0.6 / 2022-02-03 ###
* Update dependency for Transloadit Java SDK to 0.4.2
* Add Android SDK version to Transloadit-Client header
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The JARs can be downloaded manually from [Maven Central](https://search.maven.or
**Gradle:**

```groovy
implementation 'com.transloadit.android.sdk:transloadit-android:0.0.6'
implementation 'com.transloadit.android.sdk:transloadit-android:0.0.7'
```

**Maven:**
Expand All @@ -24,7 +24,7 @@ implementation 'com.transloadit.android.sdk:transloadit-android:0.0.6'
<dependency>
<groupId>com.transloadit.android.sdk</groupId>
<artifactId>transloadit-android</artifactId>
<version>0.0.6</version>
<version>0.0.7</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:7.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -19,7 +19,7 @@ plugins {

allprojects {
repositories {
maven { url "https://jitpack.io" }
mavenCentral()
google()
}
}
Expand Down
8 changes: 4 additions & 4 deletions examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ repositories {
}

android {
compileSdkVersion 32
compileSdkVersion 33
defaultConfig {
minSdkVersion 15
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand All @@ -23,9 +23,9 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'com.transloadit.sdk:transloadit:0.4.2'
implementation 'com.transloadit.sdk:transloadit:0.4.4'
implementation project(':transloadit-android')
testImplementation 'junit:junit:4.13.2'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Dec 15 15:07:56 CET 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
12 changes: 6 additions & 6 deletions transloadit-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ repositories {
}

android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
minSdkVersion 15
targetSdkVersion 30
targetSdkVersion 31
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand All @@ -25,14 +25,14 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.transloadit.sdk:transloadit:0.4.2'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.transloadit.sdk:transloadit:0.4.4'
implementation 'io.tus.android.client:tus-android-client:0.1.10'
implementation 'io.tus.java.client:tus-java-client:0.4.5'
implementation 'org.jetbrains:annotations:23.0.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:4.7.0'
testImplementation 'org.mock-server:mockserver-junit-rule:5.13.2'
testImplementation 'org.mockito:mockito-core:4.8.0'
testImplementation 'org.mock-server:mockserver-junit-rule:5.14.0'
}

def config = new ConfigSlurper().parse(new File("${projectDir}/src/main/resources/android-sdk-version/version.properties").toURI().toURL())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version="0.0.6"
version="0.0.7"
description="An Android Integration of the Transloadit's(https://transloadit.com) file uploading and encoding service."
group='com.transloadit.android.sdk'

0 comments on commit 850cb5a

Please sign in to comment.