Merge pull request #1554 from smartdevicelink/feature/gradle_4_1

Fix Gradle 4.1 compatibility issue
smartdevicelink · Nov 9, 2020 · 865eb35 · 865eb35
2 parents e1ef1b4 + 178cd27
commit 865eb35
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 19 13:26:39 EDT 2020
+#Fri Nov 06 10:04:32 EST 2020
 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-6.5-all.zip
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
@@ -7,8 +7,9 @@ android {
         targetSdkVersion 29
         versionCode 17
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 
 import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.fail;
 
 @RunWith(AndroidJUnit4.class)
 public class VersionTest {
@@ -27,10 +28,8 @@ public void testConstructorCorrect() {
     public void testConstructorIncorrect() {
         try {
             Version version = new Version("1.2");
-        } catch (Exception e) {
-            assert true;
-        }
-        assert false;
+            fail();
+        } catch (Exception e) {}
     }
 
     @Test