Skip to content

Commit 753287f

Browse files
Merge pull request #527 from TakayukiHoshi1984/modify_github_properties
github.propertiesのファイル存在チェック追加
2 parents 670dec1 + edacbd3 commit 753287f

7 files changed

Lines changed: 28 additions & 9 deletions

File tree

dConnectSDK/dConnectDemoLib/dconnect-demo-lib/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ dependencies {
4040
implementation 'androidx.fragment:fragment:1.1.0'
4141
}
4242

43+
def githubPropertiesFile = rootProject.file("github.properties")
4344
def githubProperties = new Properties()
44-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
45+
if (githubPropertiesFile.exists()) {
46+
githubProperties.load(new FileInputStream(githubPropertiesFile))
47+
}
4548

4649
def getVersionName = { ->
4750
return "1.0.1" // Replace with version Name

dConnectSDK/dConnectLibStreaming/libmedia/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'maven-publish'
3+
def githubPropertiesFile = rootProject.file("github.properties")
34
def githubProperties = new Properties()
4-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
5-
5+
if (githubPropertiesFile.exists()) {
6+
githubProperties.load(new FileInputStream(githubPropertiesFile))
7+
}
68
def getVersionName = { ->
79
return "1.0.0" // Replace with version Name
810
}

dConnectSDK/dConnectLibStreaming/libsrt/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'maven-publish'
3+
def githubPropertiesFile = rootProject.file("github.properties")
34
def githubProperties = new Properties()
4-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
5-
5+
if (githubPropertiesFile.exists()) {
6+
githubProperties.load(new FileInputStream(githubPropertiesFile))
7+
}
68
def getVersionName = { ->
79
return "1.0.0" // Replace with version Name
810
}

dConnectSDK/dConnectLibStreaming/rtsp-player-app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apply plugin: 'com.android.application'
2+
def githubPropertiesFile = rootProject.file("github.properties")
23
def githubProperties = new Properties()
3-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
4+
if (githubPropertiesFile.exists()) {
5+
githubProperties.load(new FileInputStream(githubPropertiesFile))
6+
}
47

58
android {
69
compileSdkVersion 29

dConnectSDK/dConnectLibStreaming/rtsp-server-app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apply plugin: 'com.android.application'
2+
def githubPropertiesFile = rootProject.file("github.properties")
23
def githubProperties = new Properties()
3-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
4+
if (githubPropertiesFile.exists()) {
5+
githubProperties.load(new FileInputStream(githubPropertiesFile))
6+
}
47

58
android {
69
compileSdkVersion 29

dConnectSDK/dConnectLibStreaming/srt-player-app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apply plugin: 'com.android.application'
2+
def githubPropertiesFile = rootProject.file("github.properties")
23
def githubProperties = new Properties()
3-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
4+
if (githubPropertiesFile.exists()) {
5+
githubProperties.load(new FileInputStream(githubPropertiesFile))
6+
}
47

58
android {
69
compileSdkVersion 29

dConnectSDK/dConnectLibStreaming/srt-server-app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apply plugin: 'com.android.application'
2+
def githubPropertiesFile = rootProject.file("github.properties")
23
def githubProperties = new Properties()
3-
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
4+
if (githubPropertiesFile.exists()) {
5+
githubProperties.load(new FileInputStream(githubPropertiesFile))
6+
}
47

58
android {
69
compileSdkVersion 29

0 commit comments

Comments
 (0)