3.18.1

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f807e66a5109..28c77285b33a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-sdk-cmake
 	pkgdesc = CMake from Google Android SDK
-	pkgver = 3.10.2.4988404
+	pkgver = 3.18.1
 	pkgrel = 1
 	url = https://developer.android.com/studio/index.html
 	install = android-sdk-cmake.install
@@ -9,10 +9,9 @@ pkgbase = android-sdk-cmake
 	makedepends = libxml2
 	depends = bash
 	options = !strip
-	source = https://dl-ssl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip
+	source = https://dl-ssl.google.com/android/repository/cmake-3.18.1-linux.zip
 	source = package.xml.in
-	sha1sums = 439e8799bf59f724f104bf62784b2985f1bfe561
-	sha1sums = 224baf4d7288d510556d149c165a2472c3c49072
+	sha1sums = 9435bbe2120763871c75c37a365451b48c007fed
+	sha1sums = d91d32704e0f74a0950f97b86b6420557de68bb1
 
 pkgname = android-sdk-cmake
-
diff --git a/PKGBUILD b/PKGBUILD
index e6765f68a59d..2393e2a50625 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,10 @@
 
 pkgname=android-sdk-cmake
 _major=3
-_minor=10
-_micro=2
-_build=4988404
-_urlver=$_major.$_minor.$_micro
-pkgver=$_major.$_minor.$_micro.$_build
+_minor=18
+_micro=1
+pkgver=$_major.$_minor.$_micro
+_magic=ba34c321f92f6e6fd696c8354c262c122f56abf8
 pkgrel=1
 pkgdesc='CMake from Google Android SDK'
 arch=('x86_64')
@@ -15,12 +14,12 @@ url="https://developer.android.com/studio/index.html"
 license=('custom:android-sdk-license')
 depends=('bash')
 makedepends=('libxml2') # xmllint
-source=("https://dl-ssl.google.com/android/repository/cmake-${_urlver}-linux-x86_64.zip"
+source=("https://dl-ssl.google.com/android/repository/cmake-${pkgver}-linux.zip"
         package.xml.in)
 install=android-sdk-cmake.install
 # sha1sum is from https://dl.google.com/android/repository/repository2-1.xml
-sha1sums=('439e8799bf59f724f104bf62784b2985f1bfe561'
-          '224baf4d7288d510556d149c165a2472c3c49072')
+sha1sums=('9435bbe2120763871c75c37a365451b48c007fed'
+          'd91d32704e0f74a0950f97b86b6420557de68bb1')
 options=('!strip')
 
 build() {
@@ -30,7 +29,7 @@ build() {
 
 package() {
   install -Ddm755 "$pkgdir"/opt/android-sdk/cmake/$pkgver
-  cp -dr --no-preserve=ownership "$srcdir"/{bin,share,doc,android.toolchain.cmake,source.properties} \
+  cp -dr --no-preserve=ownership "$srcdir"/{bin,doc,share,source.properties} \
     "$pkgdir"/opt/android-sdk/cmake/$pkgver
   # This is required for sdkmanager to recognize this package
   install -Dm644 "$srcdir"/package.xml "$pkgdir"/opt/android-sdk/cmake/$pkgver/package.xml
diff --git a/package.xml.in b/package.xml.in
index 089487a0aef2..f0c373ad444d 100644
--- a/package.xml.in
+++ b/package.xml.in
@@ -138,4 +138,4 @@ This is the Android Software Development Kit License Agreement
 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
 
-January 16, 2019</license><localPackage path="cmake;%MAJOR%.%MINOR%.%MICRO%.%BUILD%" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns3:genericDetailsType"/><revision><major>%MAJOR%</major><minor>%MINOR%</minor><micro>%MICRO%</micro></revision><display-name>CMake %MAJOR%.%MINOR%.%MICRO%.%BUILD%</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>
\ No newline at end of file
+January 16, 2019</license><localPackage path="cmake;%MAJOR%.%MINOR%.%MICRO%" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns3:genericDetailsType"/><revision><major>%MAJOR%</major><minor>%MINOR%</minor><micro>%MICRO%</micro></revision><display-name>CMake 3.18.1</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>