From 2e3c4a1c9d5dc8ed642864d650b513e9fedf0557 Mon Sep 17 00:00:00 2001 From: Michal Bednarski Date: Wed, 7 Aug 2019 20:31:36 +0200 Subject: [PATCH] termux-am: Switch repo and upgrade to v0.3 Includes termux/TermuxAm#2 Removed patch as it was upstreamed --- packages/termux-am/build.sh | 8 ++--- packages/termux-am/update-build.patch | 43 --------------------------- 2 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 packages/termux-am/update-build.patch diff --git a/packages/termux-am/build.sh b/packages/termux-am/build.sh index c802fa5a9..99e39e561 100644 --- a/packages/termux-am/build.sh +++ b/packages/termux-am/build.sh @@ -1,10 +1,10 @@ -TERMUX_PKG_HOMEPAGE=https://github.com/michalbednarski/TermuxAm +TERMUX_PKG_HOMEPAGE=https://github.com/termux/TermuxAm TERMUX_PKG_DESCRIPTION="Android Oreo-compatible am command reimplementation" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Michal Bednarski @michalbednarski" -TERMUX_PKG_VERSION=0.2 -TERMUX_PKG_SHA256=bde5ca8a6778a8be99370b35453eca92c8283c2987016a3d8ea6eddbad0c3f0e -TERMUX_PKG_SRCURL=https://github.com/michalbednarski/TermuxAm/archive/v$TERMUX_PKG_VERSION.zip +TERMUX_PKG_VERSION=0.3 +TERMUX_PKG_SHA256=3abfaca319f59fa769480c33d50e2ee1ff73122eac7c658f9e2a66a2da29ebb7 +TERMUX_PKG_SRCURL=https://github.com/termux/TermuxAm/archive/v$TERMUX_PKG_VERSION.zip TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="termux-tools (<< 0.51)" diff --git a/packages/termux-am/update-build.patch b/packages/termux-am/update-build.patch deleted file mode 100644 index b00ed89ab..000000000 --- a/packages/termux-am/update-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -Submitted upstream at https://github.com/michalbednarski/TermuxAm/pull/4 - -diff --git a/app/build.gradle b/app/build.gradle -index 7888fcd..07c189e 100644 ---- a/app/build.gradle -+++ b/app/build.gradle -@@ -1,11 +1,11 @@ - apply plugin: 'com.android.application' - - android { -- compileSdkVersion 26 -+ compileSdkVersion 28 - defaultConfig { - applicationId "com.example.termuxam" - minSdkVersion 21 -- targetSdkVersion 26 -+ targetSdkVersion 28 - versionCode 1 - versionName "0.1" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" -diff --git a/build.gradle b/build.gradle -index e6b32bc..6c2bb63 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -7,7 +7,7 @@ buildscript { - jcenter() - } - dependencies { -- classpath 'com.android.tools.build:gradle:3.0.1' -+ classpath 'com.android.tools.build:gradle:3.3.0' - - - // NOTE: Do not place your application dependencies here; they belong -diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties -index a23653e..4f86dee 100644 ---- a/gradle/wrapper/gradle-wrapper.properties -+++ b/gradle/wrapper/gradle-wrapper.properties -@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME - distributionPath=wrapper/dists - zipStoreBase=GRADLE_USER_HOME - zipStorePath=wrapper/dists --distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip -+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip