diff options
| author | Nick Anthony <nickanthony@google.com> | 2019-02-13 13:59:56 -0500 |
|---|---|---|
| committer | Nick Anthony <nickanthony@google.com> | 2019-02-13 21:41:27 +0000 |
| commit | 659bf67f1b62e24750bb5613e2164928229d53ba (patch) | |
| tree | 6add9bbe164d98d8eeff9b8194e683d5b4d1aa0c /development | |
| parent | ec194571ebf75a0a4c5b8a4923168da164118d8c (diff) | |
| parent | 0709ba56fd32be05b020222547598c8c6cc14308 (diff) | |
| download | support-659bf67f1b62e24750bb5613e2164928229d53ba.tar.gz | |
resolve merge conflicts of 0709ba56fd32be05b020222547598c8c6cc14308 to androidx-platform-dev
Bug: 124378604
Test: ./gradlew checkApi && ./gradlew checkResourceApi && ./gradlew buildOnServer
Change-Id: I687b7f38d4f9401ce0a80cf52a1c5807dcb2c382
Diffstat (limited to 'development')
| -rwxr-xr-x | development/update_library_versions.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/development/update_library_versions.py b/development/update_library_versions.py index 5fff9ccc176..1f2ba6b83a3 100755 --- a/development/update_library_versions.py +++ b/development/update_library_versions.py @@ -159,6 +159,9 @@ def increment_alpha_beta_version(version): else: return version, changed +def artifactId_to_kotlin_macro(artifactId): + return artifactId.replace('-','_').upper() + def update_artifact_version(lv_lines, artifact): num_lines = len(lv_lines) for i in range(num_lines): @@ -170,7 +173,7 @@ def update_artifact_version(lv_lines, artifact): new_version, ver_was_updated = increment_alpha_beta_version(artifact.version) if ver_was_updated: # Only modify line if the version was actually changed - lv_lines[i] =" val " + artifactId.upper() + " = Version(\"" + new_version + "\")\n" + lv_lines[i] =" val " + artifactId_to_kotlin_macro(artifactId) + " = Version(\"" + new_version + "\")\n" summary_log.append("Updated %s to FROM %s TO %s" % (artifactId.upper(), artifact.version, new_version)) # Assert incremented version doesn't exist if does_exist_on_gmaven(artifact.groupId, artifact.artifactId, new_version): |