diff options
| author | Robert Henigan <robert.henigan@livio.io> | 2021-04-30 14:31:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 14:31:12 -0400 |
| commit | 65c43df37ac13ca650a5548efd4c87a65a90d8cf (patch) | |
| tree | 048d0b6ca6d6587e7eea3e6dd65bc3c422863078 | |
| parent | 75512263f50748901b99487e8eb1bcdd9e551fb8 (diff) | |
| parent | 872b2a6dd61798267c4cf2347b9c22aa5990cbca (diff) | |
| download | sdl_android-65c43df37ac13ca650a5548efd4c87a65a90d8cf.tar.gz | |
Merge pull request #1679 from smartdevicelink/5.1.15.1.1
5.1.1
23 files changed, 177 insertions, 410 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 09260926b..d03b78541 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 5.1.0 Release Notes +# 5.1.1 Release Notes ## Summary: ||Version| @@ -7,93 +7,15 @@ | **RPC** | 7.1.0 | **Tested Targeting** | Android 30 -## Features: - -- [[SDL 0296] Possibility to update video streaming capabilities during ignition cycle](https://github.com/smartdevicelink/sdl_java_suite/issues/1410) - -- [[SDL 0282] Screen Manager Alert Manager](https://github.com/smartdevicelink/sdl_java_suite/issues/1304) - -- [[SDL 0269] New vehicle data ClimateData ](https://github.com/smartdevicelink/sdl_java_suite/issues/1247) - -- [[SDL 0262] New vehicle data SeatOccupancy](https://github.com/smartdevicelink/sdl_java_suite/issues/1240) - -- [[SDL 0198] - Media Skip Indicators](https://github.com/smartdevicelink/sdl_java_suite/issues/871) - - -## Enhancements: - -- [[SDL 0180] Broaden Choice Uniqueness](https://github.com/smartdevicelink/sdl_java_suite/issues/811) - -- [[SDL 0305] Homogenize TextFieldName](https://github.com/smartdevicelink/sdl_java_suite/issues/1367) - -- [[SDL 0238] Keyboard Enhancements](https://github.com/smartdevicelink/sdl_java_suite/issues/1121) - -- [[SDL 0267] Main Menu UI Updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1246) - -- [[SDL 0274] Add preferred FPS to VideoStreamingCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1268) - -- [[SDL 0292] Improve VirtualDisplayEncoder for stable frame rate](https://github.com/smartdevicelink/sdl_java_suite/issues/1361) - -- [[SDL 0255] Enhance BodyInformation vehicle data ](https://github.com/smartdevicelink/sdl_java_suite/issues/1234) - -- [[SDL 0244] Custom Playback Rates for SetMediaClockTimer](https://github.com/smartdevicelink/sdl_java_suite/issues/1147) - -- [Refactor FileManager to use queues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1572) - -- [Taskmaster should be updated to the latest version](https://github.com/smartdevicelink/sdl_java_suite/issues/1589) - -- [Refactor VoiceCommandManager to use queues](https://github.com/smartdevicelink/sdl_java_suite/issues/1549) - -- [[SDL 0323] - Align video streaming parameters with VideoStreamingCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1569) - -- [[SDL 0285] ShowConstantTBT Description Update](https://github.com/smartdevicelink/sdl_java_suite/issues/1573) - ## Bug Fixes: -- [Multiframe encryption is not implemented correctly](https://github.com/smartdevicelink/sdl_java_suite/issues/1642) - -- [Empty string bug with Menu Cell](https://github.com/smartdevicelink/sdl_java_suite/issues/1623) - -- [CRC is not set for PutFile in FileManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1622) - -- [Fix spelling of "auxillary" in StaticIconName.java](https://github.com/smartdevicelink/sdl_java_suite/issues/1632) - -- [Main Menu UI Updates Don't Take TextFieldName / ImageFieldName into account](https://github.com/smartdevicelink/sdl_java_suite/issues/1628) - -- [Choice set default timeout needs to have the same behavior as the AlertManager and needs to be aligned with iOS](https://github.com/smartdevicelink/sdl_java_suite/issues/1630) - -- [@deprecated annotation in class Javadoc makes the whole class marked as deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1626) - -- [SDL failed to start video streaming if users enable WiFi on the head unit after the NaviAPP is activated](https://github.com/smartdevicelink/sdl_java_suite/issues/1235) - -- [SDL failed to start video streaming if users enable WiFi on the phone later 150s after the NaviAPP is activated](https://github.com/smartdevicelink/sdl_java_suite/issues/1236) - -- [Missing permission check in IntegrationValidator](https://github.com/smartdevicelink/sdl_java_suite/issues/1615) - -- [OnRPCNotificationListener for ON_Button_Press JavaSE ](https://github.com/smartdevicelink/sdl_java_suite/issues/1397) - -- [Remove Refresh Handler from SdlRemoteDisplay](https://github.com/smartdevicelink/sdl_java_suite/issues/858) - -- [New thread is started for every decode operation in AudioDecoderCompat](https://github.com/smartdevicelink/sdl_java_suite/issues/1596) - -- [Tests fail because current code state doesn't match MOBILE_API](https://github.com/smartdevicelink/sdl_java_suite/issues/1597) - -- [Only auto-overwrite non-persistent files on RPC v4.3 and below](https://github.com/smartdevicelink/sdl_java_suite/issues/1580) - -- [Avoid re-uploading blank artwork](https://github.com/smartdevicelink/sdl_java_suite/issues/1579) - -- [OnServiceError for Nav and PCM is called even if no service from that type is started](https://github.com/smartdevicelink/sdl_java_suite/issues/1574) - -- [Setting a `SDLArtwork`'s `overwrite` property to true does not work with screen manager](https://github.com/smartdevicelink/sdl_java_suite/issues/1346) - -- [Supporting devices with SDL 2.0.0](https://github.com/smartdevicelink/sdl_java_suite/issues/1541) +- [Add null checks and synch around session in LCM](https://github.com/smartdevicelink/sdl_java_suite/pull/1659) -- [Gradle 4.1 compatibility issues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1551) +- [Add NPE check in BaseChoiceSetManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1648) -- [BitConverter NullPointerExeptions](https://github.com/smartdevicelink/sdl_java_suite/issues/193) +- [Attempt to fix unreproducible ClassCastException](https://github.com/smartdevicelink/sdl_java_suite/pull/1660) -- [HelloSDL JavaEE 5.1 updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1639) @@ -29,7 +29,7 @@ Contents and timing for SDL Java Suite releases can be tracked on the [GitHub Pr Additional information about recent and upcoming SDL Releases can be found in the [SDL Evolution README](https://github.com/smartdevicelink/sdl_evolution#recent-and-upcoming-releases). ## SmartDeviceLink Android -[  ](https://search.maven.org/artifact/com.smartdevicelink/sdl_android/5.1.0/aar) +[](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_android/) ### Installation @@ -42,7 +42,7 @@ repositories { mavenCentral() } dependencies { - implementation 'com.smartdevicelink:sdl_android:5.1.0' + implementation 'com.smartdevicelink:sdl_android:5.+' } ``` @@ -67,7 +67,7 @@ Developers using Proguard to shrink and obfuscate their code should be sure to i ### JavaSE -[  ](https://search.maven.org/artifact/com.smartdevicelink/sdl_java_se/5.1.0/jar) +[](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_se/) The JavaSE project is meant to allow SDL compatibility for embedded applications. @@ -80,13 +80,13 @@ repositories { mavenCentral() } dependencies { - implementation 'com.smartdevicelink:sdl_java_se:5.1.0' + implementation 'com.smartdevicelink:sdl_java_se:5.+' } ``` ### JavaEE -[  ](https://search.maven.org/artifact/com.smartdevicelink/sdl_java_ee/5.1.0/jar) +[](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_ee/) The JavaEE project is meant to allow SDL compatibility for web applications. @@ -99,7 +99,7 @@ repositories { mavenCentral() } dependencies { - implementation 'com.smartdevicelink:sdl_java_ee:5.1.0' + implementation 'com.smartdevicelink:sdl_java_ee:5.+' } ``` @@ -1 +1 @@ -5.1.0 +5.1.1 diff --git a/android/build.gradle b/android/build.gradle index e18f58322..125800c07 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:4.1.1' @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/android/sdl_android/bintray.gradle b/android/sdl_android/bintray.gradle deleted file mode 100644 index ed286eabd..000000000 --- a/android/sdl_android/bintray.gradle +++ /dev/null @@ -1,73 +0,0 @@ -apply plugin: "com.jfrog.bintray" -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'maven-publish' - -def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite' // Homepage URL of the library -def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git' // Git repository URL -group = "com.smartdevicelink" // Maven Group ID for the artifact -def libDescription = 'SmartDeviceLink mobile library for Android' -def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim() - - -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - - // Add your description here - name 'com.smartdevicelink:sdl_android' - description = libDescription - url siteUrl - - // Set your license - licenses { - license { - name 'BSD 3-Clause' - url 'https://opensource.org/licenses/BSD-3-Clause' - } - } - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -artifacts { - archives sourcesJar -} - -bintray { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - // Authorization - user = props.getProperty("bintray.user") - key = props.getProperty("bintray.key") - version = libVersion - configurations = ['archives'] - pkg { - repo = props.getProperty("bintray.repo") - name = props.getProperty("bintray.artifact") - websiteUrl = siteUrl - vcsUrl = gitUrl - userOrg = props.getProperty("bintray.userorg") - licenses = ["BSD 3-Clause"] - publish = props.getProperty("bintray.publish") // Will upload to jCenter - version { - name = libVersion // Change to release version - desc = libDescription - released = new Date() // Will be the current date & time - vcsTag = libVersion // Should match git tag - } - } -}
\ No newline at end of file diff --git a/android/sdl_android/bintray.properties b/android/sdl_android/bintray.properties deleted file mode 100644 index 05fe732b1..000000000 --- a/android/sdl_android/bintray.properties +++ /dev/null @@ -1,6 +0,0 @@ -bintray.user=username -bintray.key=apikey -bintray.repo=sdl_android -bintray.artifact=sdl_android -bintray.userorg=smartdevicelink -bintray.publish=true
\ No newline at end of file diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle index 46c1221ba..a87611ecd 100644 --- a/android/sdl_android/build.gradle +++ b/android/sdl_android/build.gradle @@ -5,7 +5,7 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 30 - versionCode 18 + versionCode 19 versionName new File(projectDir.path, ('/../../VERSION')).text.trim() buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"' resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"' @@ -59,13 +59,12 @@ dependencies { buildscript { repositories { - jcenter() mavenCentral() } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0' } } -apply from: 'bintray.gradle' +apply plugin: "com.vanniktech.maven.publish" diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties new file mode 100644 index 000000000..2ff7b607b --- /dev/null +++ b/android/sdl_android/gradle.properties @@ -0,0 +1,31 @@ +GROUP=com.smartdevicelink +POM_ARTIFACT_ID=sdl_android +VERSION_NAME=5.1.1 + +POM_NAME=sdl_android +POM_PACKAGING=aar + +POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements. +POM_INCEPTION_YEAR=2014 + +POM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git + +POM_LICENCE_NAME=BSD 3-Clause +POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause +POM_LICENCE_DIST=repo + +RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ +SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/ + +POM_DEVELOPER_ID= +POM_DEVELOPER_NAME= +POM_DEVELOPER_URL= + +signing.keyId= +signing.password= +signing.secretKeyRingFile= +SONATYPE_NEXUS_USERNAME= +SONATYPE_NEXUS_PASSWORD=
\ No newline at end of file diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 49de58abf..af63c9219 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -141,7 +141,7 @@ public class SdlRouterService extends Service { /** * <b> NOTE: DO NOT MODIFY THIS UNLESS YOU KNOW WHAT YOU'RE DOING.</b> */ - protected static final int ROUTER_SERVICE_VERSION_NUMBER = 13; + protected static final int ROUTER_SERVICE_VERSION_NUMBER = 14; private static final String ROUTER_SERVICE_PROCESS = "com.smartdevicelink.router"; @@ -3124,7 +3124,9 @@ public class SdlRouterService extends Service { int location = sessionIds.indexOf(sessionId); if (location >= 0) { Long removedSessionId = sessionIds.remove(location); - registeredTransports.remove(sessionId.intValue()); + synchronized (TRANSPORT_LOCK) { + registeredTransports.remove(sessionId.intValue()); + } return removedSessionId != null; } else { return false; @@ -3262,11 +3264,21 @@ public class SdlRouterService extends Service { * @return */ private TransportType getCompatPrimaryTransport() { - if (this.registeredTransports != null && this.registeredTransports.size() > 0) { - List<TransportType> transportTypes = this.registeredTransports.valueAt(0); - if (transportTypes != null) { - if (transportTypes.get(0) != null) { - return transportTypes.get(0); + synchronized (TRANSPORT_LOCK) { + if (this.registeredTransports != null && this.registeredTransports.size() > 0) { + Object obj = this.registeredTransports.valueAt(0); + //Lint shows to ignore this call, but there are crash logs that show otherwise + if (obj != null && obj instanceof List) { + try { + List<TransportType> transportTypes = (List<TransportType>) obj; + if (transportTypes != null) { + if (transportTypes.get(0) != null) { + return transportTypes.get(0); + } + } + } catch (ClassCastException e) { + DebugTool.logError(TAG, "Unable to cast transport list", e); + } } } } diff --git a/android/sdl_android/src/main/res/values/sdl.xml b/android/sdl_android/src/main/res/values/sdl.xml index bc83d733e..1d5f0897a 100644 --- a/android/sdl_android/src/main/res/values/sdl.xml +++ b/android/sdl_android/src/main/res/values/sdl.xml @@ -2,7 +2,7 @@ <resources> <string name="sdl_router_service_version_name" translatable="false">sdl_router_version</string> - <integer name="sdl_router_service_version_value">13</integer> + <integer name="sdl_router_service_version_value">14</integer> <string name="sdl_router_service_is_custom_name" translatable="false">sdl_custom_router</string> </resources> diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java index 7073ad7ba..57cf59ff8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -44,6 +44,7 @@ import com.smartdevicelink.managers.permission.PermissionManager; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.ProtocolMessage; +import com.smartdevicelink.protocol.SdlProtocolBase; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.MessageType; import com.smartdevicelink.protocol.enums.SessionType; @@ -987,17 +988,30 @@ abstract class BaseLifecycleManager { @Override public boolean isConnected() { - return BaseLifecycleManager.this.session.getIsConnected(); + synchronized (BaseLifecycleManager.this) { + if (BaseLifecycleManager.this.session != null) { + return BaseLifecycleManager.this.session.getIsConnected(); + } + } + return false; } @Override public void addServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) { - BaseLifecycleManager.this.session.addServiceListener(serviceType, sdlServiceListener); + synchronized (BaseLifecycleManager.this) { + if(BaseLifecycleManager.this.session != null ){ + BaseLifecycleManager.this.session.addServiceListener(serviceType, sdlServiceListener); + } + } } @Override public void removeServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) { - BaseLifecycleManager.this.session.removeServiceListener(serviceType, sdlServiceListener); + synchronized (BaseLifecycleManager.this) { + if (BaseLifecycleManager.this.session != null) { + BaseLifecycleManager.this.session.removeServiceListener(serviceType, sdlServiceListener); + } + } } @Override @@ -1064,14 +1078,25 @@ abstract class BaseLifecycleManager { @Override public boolean isTransportForServiceAvailable(SessionType serviceType) { - return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType); + synchronized (BaseLifecycleManager.this) { + if (BaseLifecycleManager.this.session != null) { + return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType); + } + } + return false; } @NonNull @Override public SdlMsgVersion getSdlMsgVersion() { - SdlMsgVersion msgVersion = new SdlMsgVersion(rpcSpecVersion.getMajor(), rpcSpecVersion.getMinor()); - msgVersion.setPatchVersion(rpcSpecVersion.getPatch()); + SdlMsgVersion msgVersion; + if(rpcSpecVersion != null) { + msgVersion = new SdlMsgVersion(rpcSpecVersion.getMajor(), rpcSpecVersion.getMinor()); + msgVersion.setPatchVersion(rpcSpecVersion.getPatch()); + } else { + msgVersion = new SdlMsgVersion(1,0); + } + return msgVersion; } @@ -1083,7 +1108,12 @@ abstract class BaseLifecycleManager { @Override public long getMtu(SessionType serviceType) { - return BaseLifecycleManager.this.session.getMtu(serviceType); + synchronized (BaseLifecycleManager.this) { + if (BaseLifecycleManager.this.session != null) { + return BaseLifecycleManager.this.session.getMtu(serviceType); + } + } + return SdlProtocolBase.V1_V2_MTU_SIZE; } @Override diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java index 44303c4bd..746d49865 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java @@ -348,14 +348,14 @@ abstract class BaseChoiceSetManager extends BaseSubManager { ChoiceSetSelectionListener privateChoiceListener = new ChoiceSetSelectionListener() { @Override public void onChoiceSelected(ChoiceCell choiceCell, TriggerSource triggerSource, int rowIndex) { - if (pendingPresentationSet.getChoiceSetSelectionListener() != null) { + if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) { pendingPresentationSet.getChoiceSetSelectionListener().onChoiceSelected(choiceCell, triggerSource, rowIndex); } } @Override public void onError(String error) { - if (pendingPresentationSet.getChoiceSetSelectionListener() != null) { + if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) { pendingPresentationSet.getChoiceSetSelectionListener().onError(error); } } diff --git a/javaEE/hello_sdl_java_ee/build.gradle b/javaEE/hello_sdl_java_ee/build.gradle index 105285adf..7088fc739 100644 --- a/javaEE/hello_sdl_java_ee/build.gradle +++ b/javaEE/hello_sdl_java_ee/build.gradle @@ -10,7 +10,6 @@ repositories { mavenCentral() mavenLocal() google() - jcenter() } // This extraLibs solution is explained here: https://discuss.gradle.org/t/how-to-include-dependencies-in-jar/19571/5 configurations { diff --git a/javaEE/javaEE/bintray.gradle b/javaEE/javaEE/bintray.gradle deleted file mode 100644 index f54efe333..000000000 --- a/javaEE/javaEE/bintray.gradle +++ /dev/null @@ -1,96 +0,0 @@ -apply plugin: "com.jfrog.bintray" -apply plugin: 'maven-publish' -apply plugin: 'maven' - -def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite' // Homepage URL of the library -def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git' // Git repository URL -def libDescription = 'SmartDeviceLink mobile library' -def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim() - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -javadoc.failOnError = false -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar - archives javadocJar -} - -bintray { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - // Authorization - user = props.getProperty("bintray.user") - key = props.getProperty("bintray.key") - version = libVersion - publications = ['mavenPublication'] - - - pkg { - repo = props.getProperty("bintray.repo") - name = props.getProperty("bintray.package") - websiteUrl = siteUrl - vcsUrl = gitUrl - userOrg = props.getProperty("bintray.userorg") - licenses = ["BSD 3-Clause"] - publish = props.getProperty("bintray.publish") // Will upload to jCenter - version { - name = libVersion // Change to release version - desc = libDescription - released = new Date() // Will be the current date & time - vcsTag = libVersion // Should match git tag - } - } -} - -def pomConfig = { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - licenses { - license { - name 'BSD 3-Clause' - url 'https://opensource.org/licenses/BSD-3-Clause' - distribution "repo" - } - } - - scm { - url siteUrl - } -} - -publishing { - publications { - mavenPublication(MavenPublication) { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - from components.java - artifact sourcesJar { - classifier "sources" - } - artifact javadocJar { - classifier "javadoc" - } - groupId props.getProperty("bintray.group") - artifactId props.getProperty("bintray.artifact") - version libVersion - pom.withXml { - def root = asNode() - root.appendNode('description', libDescription) - root.appendNode('name', props.getProperty("bintray.artifact")) - root.appendNode('url', siteUrl) - root.children().last() + pomConfig - } - } - } -}
\ No newline at end of file diff --git a/javaEE/javaEE/bintray.properties b/javaEE/javaEE/bintray.properties deleted file mode 100644 index aa1926ba5..000000000 --- a/javaEE/javaEE/bintray.properties +++ /dev/null @@ -1,8 +0,0 @@ -bintray.user=username -bintray.key=apikey -bintray.userorg=smartdevicelink -bintray.repo=sdl_java_ee -bintray.package=sdl_javaee -bintray.group=com.smartdevicelink -bintray.artifact=sdl_java_ee -bintray.publish=true
\ No newline at end of file diff --git a/javaEE/javaEE/build.gradle b/javaEE/javaEE/build.gradle index 1efaa324e..a97824e30 100644 --- a/javaEE/javaEE/build.gradle +++ b/javaEE/javaEE/build.gradle @@ -7,16 +7,16 @@ sourceCompatibility = 1.7 buildscript { repositories { - jcenter() + mavenCentral() } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0' } } repositories { google() - jcenter() + mavenCentral() } // This extraLibs solution is explained here: https://discuss.gradle.org/t/how-to-include-dependencies-in-jar/19571/5 @@ -78,4 +78,4 @@ public final class BuildConfig { } } -apply from: 'bintray.gradle'
\ No newline at end of file +apply plugin: "com.vanniktech.maven.publish"
\ No newline at end of file diff --git a/javaEE/javaEE/gradle.properties b/javaEE/javaEE/gradle.properties new file mode 100644 index 000000000..deba1f427 --- /dev/null +++ b/javaEE/javaEE/gradle.properties @@ -0,0 +1,31 @@ +GROUP=com.smartdevicelink +POM_ARTIFACT_ID=sdl_java_ee +VERSION_NAME=5.1.1 + +POM_NAME=sdl_java_ee +POM_PACKAGING=jar + +POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements. +POM_INCEPTION_YEAR=2014 + +POM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git + +POM_LICENCE_NAME=BSD 3-Clause +POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause +POM_LICENCE_DIST=repo + +RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ +SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/ + +POM_DEVELOPER_ID= +POM_DEVELOPER_NAME= +POM_DEVELOPER_URL= + +signing.keyId= +signing.password= +signing.secretKeyRingFile= +SONATYPE_NEXUS_USERNAME= +SONATYPE_NEXUS_PASSWORD= diff --git a/javaSE/hello_sdl_java/build.gradle b/javaSE/hello_sdl_java/build.gradle index 996affcd0..591037210 100644 --- a/javaSE/hello_sdl_java/build.gradle +++ b/javaSE/hello_sdl_java/build.gradle @@ -10,7 +10,6 @@ repositories { mavenCentral() mavenLocal() google() - jcenter() } // This extraLibs solution is explained here: https://discuss.gradle.org/t/how-to-include-dependencies-in-jar/19571/5 configurations { diff --git a/javaSE/javaSE/bintray.gradle b/javaSE/javaSE/bintray.gradle deleted file mode 100644 index 9b890b842..000000000 --- a/javaSE/javaSE/bintray.gradle +++ /dev/null @@ -1,96 +0,0 @@ -apply plugin: "com.jfrog.bintray" -apply plugin: 'maven-publish' -apply plugin: 'maven' - -def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite' // Homepage URL of the library -def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git' // Git repository URL -def libDescription = 'SmartDeviceLink mobile library' -def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim() - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -javadoc.failOnError = false -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar - archives javadocJar -} - -bintray { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - // Authorization - user = props.getProperty("bintray.user") - key = props.getProperty("bintray.key") - version = libVersion - publications = ['mavenPublication'] - - - pkg { - repo = props.getProperty("bintray.repo") - name = props.getProperty("bintray.package") - websiteUrl = siteUrl - vcsUrl = gitUrl - userOrg = props.getProperty("bintray.userorg") - licenses = ["BSD 3-Clause"] - publish = props.getProperty("bintray.publish") // Will upload to jCenter - version { - name = libVersion // Change to release version - desc = libDescription - released = new Date() // Will be the current date & time - vcsTag = libVersion // Should match git tag - } - } -} - -def pomConfig = { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - licenses { - license { - name 'BSD 3-Clause' - url 'https://opensource.org/licenses/BSD-3-Clause' - distribution "repo" - } - } - - scm { - url siteUrl - } -} - -publishing { - publications { - mavenPublication(MavenPublication) { - Properties props = new Properties() - props.load(new FileInputStream("$projectDir/bintray.properties")) - - from components.java - artifact sourcesJar { - classifier "sources" - } - artifact javadocJar { - classifier "javadoc" - } - groupId props.getProperty("bintray.group") - artifactId props.getProperty("bintray.artifact") - version libVersion - pom.withXml { - def root = asNode() - root.appendNode('description', libDescription) - root.appendNode('name', props.getProperty("bintray.artifact")) - root.appendNode('url', siteUrl) - root.children().last() + pomConfig - } - } - } -}
\ No newline at end of file diff --git a/javaSE/javaSE/bintray.properties b/javaSE/javaSE/bintray.properties deleted file mode 100644 index b491c7774..000000000 --- a/javaSE/javaSE/bintray.properties +++ /dev/null @@ -1,8 +0,0 @@ -bintray.user=username -bintray.key=apikey -bintray.userorg=smartdevicelink -bintray.repo=sdl_java_se -bintray.package=sdl_javase -bintray.group=com.smartdevicelink -bintray.artifact=sdl_java_se -bintray.publish=true
\ No newline at end of file diff --git a/javaSE/javaSE/build.gradle b/javaSE/javaSE/build.gradle index ef93e9aad..94b7a54d1 100644 --- a/javaSE/javaSE/build.gradle +++ b/javaSE/javaSE/build.gradle @@ -8,16 +8,16 @@ sourceCompatibility = 1.7 buildscript { repositories { - jcenter() + mavenCentral() } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0' } } repositories { google() - jcenter() + mavenCentral() } // This extraLibs solution is explained here: https://discuss.gradle.org/t/how-to-include-dependencies-in-jar/19571/5 @@ -78,4 +78,4 @@ public final class BuildConfig { } } -apply from: 'bintray.gradle' +apply plugin: "com.vanniktech.maven.publish"
\ No newline at end of file diff --git a/javaSE/javaSE/gradle.properties b/javaSE/javaSE/gradle.properties new file mode 100644 index 000000000..7b3651b0c --- /dev/null +++ b/javaSE/javaSE/gradle.properties @@ -0,0 +1,31 @@ +GROUP=com.smartdevicelink +POM_ARTIFACT_ID=sdl_java_se +VERSION_NAME=5.1.1 + +POM_NAME=sdl_java_se +POM_PACKAGING=jar + +POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements. +POM_INCEPTION_YEAR=2014 + +POM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite +POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git + +POM_LICENCE_NAME=BSD 3-Clause +POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause +POM_LICENCE_DIST=repo + +RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ +SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/ + +POM_DEVELOPER_ID= +POM_DEVELOPER_NAME= +POM_DEVELOPER_URL= + +signing.keyId= +signing.password= +signing.secretKeyRingFile= +SONATYPE_NEXUS_USERNAME= +SONATYPE_NEXUS_PASSWORD= diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java index d3770a95c..1e3915205 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java @@ -32,5 +32,5 @@ package com.smartdevicelink; // THIS FILE IS AUTO GENERATED, DO NOT MODIFY!! public final class BuildConfig { - public static final String VERSION_NAME = "5.1.0"; + public static final String VERSION_NAME = "5.1.1"; }
\ No newline at end of file |