Merge pull request #87 from XYOracleNetwork/release

Dependency updates
XYOracleNetwork · Jul 21, 2020 · f0ecf98 · f0ecf98
2 parents 346d7d7 + c1ce8d1
commit f0ecf98
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11.0    
     - name: pre-build
       run:  chmod +x ./gradlew
     - name: build

diff --git a/.github/workflows/minorBuild.yml b/.github/workflows/minorBuild.yml
@@ -14,6 +14,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11.0     
     - name: pre-build
       run:  chmod +x ./gradlew
     - name: build

diff --git a/.github/workflows/prepRelease.yml b/.github/workflows/prepRelease.yml
@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11.0     
     - name: pre-build
       run:  chmod +x ./gradlew
     - name: clean

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11.0
       - name: pre-build
         run: chmod +x gradlew
       - name: install

diff --git a/ble-android-library/build.gradle b/ble-android-library/build.gradle
@@ -66,8 +66,8 @@ android {
     versionProps.store(versionPropsFile.newWriter(), null) 
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 11.0
+        targetCompatibility = 11.0
         kotlinOptions {
             allWarningsAsErrors = true
         }
@@ -159,9 +159,9 @@ ktlint {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61'
+    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72'
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    api 'org.jetbrains.kotlin:kotlin-reflect:1.3.61'
+    api 'org.jetbrains.kotlin:kotlin-reflect:1.3.72'
     api 'network.xyo:sdk-base-android:2.1.288'
     api 'org.jetbrains:annotations:17.0.0'
     api 'org.bouncycastle:bcpkix-jdk15on:1.64'

diff --git a/ble-android-library/version.properties b/ble-android-library/version.properties
@@ -1,2 +1,2 @@
-#Fri Jul 17 21:53:23 UTC 2020
-VERSION_PATCH=1146
+#Tue Jul 21 18:34:39 UTC 2020
+VERSION_PATCH=1147
diff --git a/ble-android-sample-java/build.gradle b/ble-android-sample-java/build.gradle
@@ -37,8 +37,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01'
-    implementation 'com.google.android.material:material:1.2.0-alpha04'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
     implementation project(':ble-android-library')
-    api 'network.xyo:sdk-base-android:2.1.282'
+    api 'network.xyo:sdk-base-android:2.1.288'
 }
diff --git a/ble-android-sample/build.gradle b/ble-android-sample/build.gradle
@@ -58,14 +58,14 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api 'com.google.android.material:material:1.2.0-alpha04'
+    api 'com.google.android.material:material:1.3.0-alpha01'
     api 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     api "com.nabinbhandari.android:permissions:3.8"
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'

diff --git a/build.gradle b/build.gradle
@@ -9,9 +9,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
 
         // NOTE: Do not place your application dependencies here; they belong