Browse Source

Merge pull request #964 from nextcloud/bumpTo8.3alpha

Bump master to 11.0.0 Alpha 01
Tobias Kaminsky 4 years ago
parent
commit
4c756ca17a
3 changed files with 5 additions and 6 deletions
  1. 2 3
      app/build.gradle
  2. 2 2
      scripts/analysis/analysis-wrapper.sh
  3. 1 1
      scripts/analysis/lint-results.txt

+ 2 - 3
app/build.gradle

@@ -34,13 +34,12 @@ android {
     buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.nextcloud.talk2"
-        versionName version
         minSdkVersion 21
         targetSdkVersion 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 80020090 // 0-50=Alpha / 51-98=RC / 90-99=stable
-        versionName "8.2.0"
+        versionCode 110000001 // 0-50=Alpha / 51-98=RC / 90-99=stable
+        versionName "11.0.0 Alpha 01"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

+ 2 - 2
scripts/analysis/analysis-wrapper.sh

@@ -29,7 +29,7 @@ if [ $3 = "master" ]; then
     
     if [ $lintValue -ne 1 ]; then
         echo "New lint result for master at: https://www.kaminsky.me/nc-dev/talk-lint/master.html"
-        curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/master.html --upload-file app/build/reports/lint/lint.html
+        curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/master.html --upload-file app/build/reports/lint/lint.html
         exit 0
     fi
 else
@@ -37,7 +37,7 @@ else
         6="master-"$(date +%F)
     fi
     echo "New lint results at https://www.kaminsky.me/nc-dev/talk-lint/$6.html"
-    curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/$6.html --upload-file app/build/reports/lint/lint.html
+    curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/$6.html --upload-file app/build/reports/lint/lint.html
     
     echo "New findbugs results at https://www.kaminsky.me/nc-dev/talk-findbugs/$6.html"
     curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/$6.html --upload-file app/build/reports/findbugs/findbugs.html

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 90 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 240 warnings</span>