Commit Graph

1983 Commits

Author SHA1 Message Date
Jan Vidar Krey
5f0d53ba20 Support bounding targetSdkVersion between minSdkVersion and maxSdkVersion
It is possible to create a an AndroidStudio project that uses the following
nonsense settings:

    defaultConfig {
        minSdkVersion 15
        maxSdkVersion 19
        targetSdkVersion 25
    }

The application is successfully built by Android Studio, and the APK
works when installed on the relevant devices, however the app cannot
be re-built with Apktool afterwards.

This patch works around the problem by explicitly setting the
targetSdkVersion to the max of the maxSdkVersion and min of the minSdkVersion
only if these are specified.
2017-09-15 16:24:39 +02:00
Connor Tumbleson
d00e60c3cf
smaller image 2017-09-15 08:07:20 -04:00
Connor Tumbleson
525aafed26
cut down size on huge intellij logo 2017-09-15 08:04:40 -04:00
Connor Tumbleson
161cd5dbce
add intellij badge 2017-09-15 08:02:32 -04:00
Connor Tumbleson
a0ae7eaea8
Skip any file attempting to use relative paths
- fixes #1589
2017-09-03 18:12:57 -04:00
Connor Tumbleson
e8a8b33182 Merge branch 'xpirt-master' 2017-09-01 15:56:48 -04:00
Connor Tumbleson
f4ae717c96 Merge branch 'master' of https://github.com/xpirt/Apktool into xpirt-master 2017-09-01 15:55:52 -04:00
Andrei Conache
5a17843284 Merge branch 'master' of https://github.com/xpirt/Apktool 2017-08-27 18:20:23 +02:00
Andrei Conache
5cdbca30fd fix #970 and add long api level option 2017-08-27 18:20:20 +02:00
Andrei Conache
14c5f87e6e fix indentation 2017-08-27 16:21:54 +02:00
Andrei Conache
c6b2f26021 update CLI commons API and optimize imports
- fixed deprecated API warnings
2017-08-27 16:12:06 +02:00
Connor Tumbleson
0a16705430
Merge branch 'footpatch-patch-1' 2017-08-27 09:57:46 -04:00
Connor Tumbleson
1c33fba646
close reader as well if syntax error 2017-08-27 09:57:32 -04:00
Connor Tumbleson
d6e676c583
Merge branch 'patch-1' of https://github.com/footpatch/Apktool into footpatch-patch-1 2017-08-27 09:56:39 -04:00
Connor Tumbleson
78a80d14b0 Merge pull request #1601 from xpirt/master
fix potential class cast exceptions
2017-08-27 09:55:13 -04:00
Connor Tumbleson
e9618fae6b
Windows binary is still 32 bit 2017-08-27 09:54:36 -04:00
Andrei Conache
9abaa4ee30 fix potential class cast exceptions
- fixes #1444
2017-08-27 15:23:08 +02:00
footpatch
1fddb05b71 Close input stream in SmaliMod.java 2017-08-25 20:47:31 +02:00
Connor Tumbleson
481299c748
Update Windows scripts for unicode support
- fixes #1595
2017-08-25 06:36:50 -04:00
Connor Tumbleson
ff8245af97
update internal framework to API 26 (Android Oreo) 2017-08-24 22:54:42 -04:00
Connor Tumbleson
67b2325136
add font test 2017-08-24 22:49:43 -04:00
Connor Tumbleson
fa966d2d66 Drop 32 bit binaries
- update unix/win/mac 64 bit binaries
 - fixes #1598
 - refs #1594
2017-08-24 15:53:52 -04:00
Connor Tumbleson
91ef166ffb
unix aapt binaries - apktool-8.0.0_r4 2017-08-24 06:31:04 -04:00
Connor Tumbleson
800394cf30 new qualifiers require v26 naming 2017-08-23 17:53:33 -04:00
Connor Tumbleson
adeffe3e98 Initial work at qualifier test suite changes 2017-08-23 17:04:26 -04:00
Connor Tumbleson
c818dc85f0 mac aapt binaries - apktool-8.0.0_r4 2017-08-23 17:04:11 -04:00
Connor Tumbleson
0f4cfcb892 Tweak colorimetry to colorMode 2017-08-23 17:03:51 -04:00
Connor Tumbleson
68a7eb7a74 example applications (sparse & not) tests
- update ARSCDecoder to detail sparse applications
2017-08-23 14:43:57 -04:00
Connor Tumbleson
e70ab4c27f update docs for aapt - android_8.0.0_r4 tag 2017-08-23 14:27:07 -04:00
Connor Tumbleson
6473611d47 Initial work for Sparsed Resource Types
- die out if encountered
2017-08-23 14:14:48 -04:00
Connor Tumbleson
bf44f9b809 Support for Color HDR & Gamut 2017-08-23 13:53:30 -04:00
Connor Tumbleson
eee73b945d Support for VRHeadset Qualifier 2017-08-23 13:05:08 -04:00
Connor Tumbleson
f886c7094d Merge pull request #1590 from iBotPeaches/issue-1586
Refactor directory checks to prevent assumptions
2017-08-15 17:02:19 -04:00
Connor Tumbleson
a1cb15d721 add additional tests for (json/png) deflated unknown files 2017-08-15 17:01:53 -04:00
Connor Tumbleson
79454823b3 Refactor directory checks to prevent assumptions
- only checks directory path of apktool framework location
 - fixes #1586
2017-08-15 15:52:46 -04:00
Connor Tumbleson
f9c091f54b refactor sdk codename to sdk level into function 2017-08-15 15:35:26 -04:00
Connor Tumbleson
86c2df6648
note about security contact 2017-08-15 08:00:28 -04:00
Connor Tumbleson
2f3872885c Merge pull request #1574 from iBotPeaches/issue-1571
rework travis-ci builds
2017-07-31 06:45:45 -04:00
Connor Tumbleson
0ff93b6fc4
openjdk8 is not allowed to fail 2017-07-31 06:39:27 -04:00
Connor Tumbleson
5526e363c6
rework travis-ci builds 2017-07-31 06:32:46 -04:00
Connor Tumbleson
411f0cbfe7
add notes about including sha256 hash 2017-07-29 15:07:12 -04:00
Connor Tumbleson
3d6e7e2fb7
start new dev cycle (2.2.5-SNAPSHOT) 2017-07-29 09:44:57 -04:00
Connor Tumbleson
045b7e7cc9
version bump (2.2.4) 2017-07-29 08:09:11 -04:00
Connor Tumbleson
1a8916e852 Merge pull request #1570 from iBotPeaches/issue-1564
Survive decoder if malformed string is encountered
2017-07-27 07:48:46 -04:00
Connor Tumbleson
15bc16c6bd
Survive decoder if malformed string is encountered
- fixes #1564
2017-07-27 06:55:18 -04:00
Connor Tumbleson
ad59fdd378 Merge pull request #1568 from iBotPeaches/issue-1534a
Don't read more data than entryChunk has
2017-07-26 16:37:00 -04:00
Connor Tumbleson
eda95b3da2 Don't read more data than entryChunk has
- fixes #1534
2017-07-26 16:21:59 -04:00
Connor Tumbleson
e93ae011a8 Merge pull request #1567 from iBotPeaches/windows_build
Detect root file path on windows vs others
2017-07-26 08:38:48 -04:00
Connor Tumbleson
0f0ec681b7 Detect root file path on windows vs others 2017-07-26 08:22:27 -04:00
Connor Tumbleson
79a9eff939 Merge pull request #1554 from iBotPeaches/issue-1553
Skip JAXP 1.5 features if not on host
2017-07-17 16:43:00 -04:00