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.

Sign up for GitHub

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

Jump to bottom

Fix Gradle 4.1 compatibility issue #1554

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Fix Gradle 4.1 compatibility issue #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d065a4b
Update gradle plugin to 4.1
bilal-alsharifi Nov 6, 2020
72751ad
Add VERSION_NAME as buildConfigField to build.gradle
bilal-alsharifi Nov 6, 2020
178cd27
Fix unit tests
bilal-alsharifi Nov 6, 2020
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
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion android/sdl_android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down