Merge pull request #202 from DP-3T/feature/publish-develop-branch-to-…

…jcenter

publish develop branch to jcenter

.github/workflows/bintray-develop.yml

@@ -0,0 +1,19 @@
+name: Upload AAR to bintray
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build:
+    name: "Upload AAR to bintray"
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Upload
+      run: cd dp3t-sdk; ./gradlew bintrayUpload -PbintrayUser=${{secrets.BINTRAY_USER}} -PbintrayApikey=${{secrets.BINTRAY_APIKEY}} -PbintrayVersionSuffix=-dev-$GITHUB_RUN_NUMBER

dp3t-sdk/sdk/build.gradle

@@ -21,8 +21,8 @@ android {
 	defaultConfig {
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 104
-		versionName "1.0.4"
+		versionCode 105
+		versionName "1.0.5"
 		testInstrumentationRunnerArgument 'androidx.benchmark.suppressErrors', 'EMULATOR,LOW-BATTERY,ACTIVITY-MISSING,DEBUGGABLE,UNLOCKED,UNSUSTAINED-ACTIVITY-MISSING'
 		testInstrumentationRunner "androidx.benchmark.junit4.AndroidBenchmarkRunner"
 
@@ -65,29 +65,34 @@ afterEvaluate {
 				from components.productionRelease
 				groupId 'org.dpppt'
 				artifactId 'dp3t-sdk-android'
-				version android.defaultConfig.versionName
+				version android.defaultConfig.versionName + readPropertyWithDefault('bintrayVersionSuffix', '')
 				artifact androidSourcesJar
 			}
 			"sdkCalibration"(MavenPublication) {
 				from components.calibrationRelease
 				groupId 'org.dpppt'
 				artifactId 'dp3t-sdk-android'
-				version android.defaultConfig.versionName + "-calibration"
+				version android.defaultConfig.versionName + readPropertyWithDefault('bintrayVersionSuffix', '') + "-calibration"
 				artifact androidSourcesJar
 			}
 		}
 	}
 }
 
-ext.readProperty = { paramName ->
+ext.readProperty = { paramName -> readPropertyWithDefault(paramName, null) }
+ext.readPropertyWithDefault = { paramName, defaultValue ->
 	if (project.hasProperty(paramName)) {
 		return project.getProperties().get(paramName)
 	} else {
 		Properties properties = new Properties()
 		if (project.rootProject.file('local.properties').exists()) {
 			properties.load(project.rootProject.file('local.properties').newDataInputStream())
 		}
-		return properties.getProperty(paramName)
+		if (properties.getProperty(paramName) != null) {
+			return properties.getProperty(paramName)
+		} else {
+			return defaultValue
+		}
 	}
 }