Commit Graph

1381 Commits

Author SHA1 Message Date
Connor Tumbleson
34b4cfd515 Merge branch 'master' into master 2017-07-12 14:45:53 -04:00
Marc Miltenberger
5359ac0ef5 Make sure to close the file after reading in. The parse(File) method does not close the file under all circumstances. 2017-07-12 20:16:00 +02:00
Connor Tumbleson
d9d8c0adac
remove submodule init 2017-07-09 11:01:47 -04:00
Connor Tumbleson
856cc2822c
Prevent license checks from running
- update internal docs to explain license tasks
2017-07-09 10:55:57 -04:00
Connor Tumbleson
cd14ede339
remove findbugs 2017-07-09 10:27:22 -04:00
Connor Tumbleson
597f2ec8a4
Remove obnoxious javac warning for older source in classpath 2017-07-09 10:19:13 -04:00
Connor Tumbleson
380cb9b109 Merge pull request #1557 from iBotPeaches/issue-1556
Internalize constants to not rely on JDKs
2017-07-08 14:26:21 -04:00
Connor Tumbleson
2bd10a7d9f
Internalize constants to not rely on JDKs 2017-07-08 14:20:26 -04:00
Connor Tumbleson
3bbab052c4 spelling fix 2017-07-06 10:15:44 -04:00
Connor Tumbleson
d0d84bf569 slight formatting cleanup 2017-07-05 16:00:02 -04:00
Connor Tumbleson
1c23bb3962 remove duplicate code in favor of function 2017-07-05 15:44:10 -04:00
Connor Tumbleson
657a44f593 Stop DOCTYPE decl dead in the tracks 2017-07-05 15:36:54 -04:00
Connor Tumbleson
20a7837ec5 Merge pull request #1551 from iBotPeaches/directory-trav
Prevent malicious directory/file with unknown files
2017-07-05 12:54:14 -04:00
Connor Tumbleson
1c0d6abb75 update license headers 2017-07-05 12:45:51 -04:00
Connor Tumbleson
02c8b62b00 Prevent malicious directory/file work with unknown files 2017-07-05 12:45:17 -04:00
Connor Tumbleson
2e7f2a9b76 Merge pull request #1552 from iBotPeaches/license
License Plugin
2017-07-05 12:45:01 -04:00
Connor Tumbleson
1597c12472 changed all license files 2017-07-05 12:05:52 -04:00
Connor Tumbleson
30b15fb0ca Add License plugin 2017-07-05 12:03:40 -04:00
Connor Tumbleson
e7e8747792 Exit application only after version command 2017-07-05 11:06:34 -04:00
Connor Tumbleson
fce273adaf Merge pull request #1528 from iBotPeaches/issue-1520
Kotlin Support
2017-07-04 10:05:20 -04:00
Connor Tumbleson
2a1160f720 Add unit test for kotlin applications 2017-07-04 09:55:50 -04:00
Connor Tumbleson
93d61cc07a kotlin folder should not be treated as unknown - #1520 2017-07-04 09:55:50 -04:00
Connor Tumbleson
26512c7737
update internal framework to API 26 (Final O Dev Preview)
- refs #1520
2017-07-03 08:11:15 -04:00
Connor Tumbleson
6ce02e143d
update internal aapt to API 26
- refs #1520
2017-07-03 08:10:59 -04:00
Connor Tumbleson
988fd15f0a
Upgrade to gradle 4.0
- updated common functions into closures for exporting
2017-07-03 07:16:53 -04:00
Connor Tumbleson
f8fe98d9a6 code style 2017-06-29 11:30:00 -04:00
Bing Qiao
28883538a7 Class.class.getResourceAsStream tries to load resource from root directory. This fails when apktool is built into a fat jar like Spring boot executable so that the classloader tries to load the resource from the root directory of the Spring boot jar instead of that of the bundled appktool jar. 2017-06-29 12:36:05 +01:00
Connor Tumbleson
b45054e65e Merge branch 'MarcMil-master' 2017-06-28 10:09:29 -04:00
Connor Tumbleson
40ece96a1a remove shorthand if statement syntax 2017-06-28 10:09:15 -04:00
Marc Miltenberger
5d383e4a62 Basically, on import getResSpec is called multiple times and very often throws an exception. Returning null is much faster and therefore in cases where the caller does not rely on a thrown exception, it may use the new getResSpecUnsafe method. 2017-06-28 11:24:40 +02:00
Connor Tumbleson
ef022466be Upgrade to SnakeYAML 1.18 (Android)
- fixes #591
2017-06-27 17:31:42 -04:00
Connor Tumbleson
acb0044910
start new dev cycle (2.2.4-SNAPSHOT) 2017-06-13 07:31:16 -04:00
Connor Tumbleson
13ec3b6bfa
version bump (2.2.3) 2017-06-12 08:23:44 -04:00
Connor Tumbleson
95f86fc6ed
Merge branch 'playtestcloud-issue-1498' 2017-06-11 17:40:48 -04:00
Connor Tumbleson
28848319af
Skip resources for test 2017-06-11 17:40:25 -04:00
Marvin Killing
4ce8a00180 Merge branch 'master' into issue-1498 2017-06-09 22:56:04 +02:00
Connor Tumbleson
c93e1b6f3f Merge pull request #1529 from iBotPeaches/robust9patchtest
Adding a few random AOSP 9 patch images to make test suite more robust.
2017-06-09 13:19:34 -04:00
Connor Tumbleson
dab59a2aec
Adding a few random AOSP 9 patch images to more test suite more robust. 2017-06-09 08:20:41 -04:00
Connor Tumbleson
4a3e24666e code style cleanup 2017-06-08 16:51:28 -04:00
Connor Tumbleson
b6751f893c add test for #1511 2017-06-08 16:51:16 -04:00
Connor Tumbleson
bd62f7e3e5 Merge branch 'fix-optical-inset' of https://github.com/phhusson/Apktool into phhusson-fix-optical-inset 2017-06-08 15:52:14 -04:00
Connor Tumbleson
8efa9967e7
adding Sourcetoad sponsorship information
- https://connortumbleson.com/2017/06/07/apktool-sourcetoad-to-sponsor-development/
2017-06-07 19:07:49 -04:00
Connor Tumbleson
a918b49bff
Update internal aapt's to android-7.1.2_r11
- fixes #1516
2017-05-30 08:59:06 -04:00
Connor Tumbleson
e794508869
cleanup tests 2017-05-27 15:23:39 -04:00
Connor Tumbleson
f19317d87c
Prevent doctypes declarations 2017-05-27 15:12:54 -04:00
Pierre-Hugues HUSSON
2a35125441 Merge branch 'master' into fix-optical-inset 2017-05-26 10:07:29 +02:00
Connor Tumbleson
6e47d3687b
Merge branch 'phhusson-fix-grayalpha-9patch' 2017-05-25 07:02:34 -04:00
Connor Tumbleson
a00da345b2
code style cleanup 2017-05-25 07:02:23 -04:00
Connor Tumbleson
c3ea300b96
Add unit-test for #1508 2017-05-25 07:02:10 -04:00
Connor Tumbleson
d2e16044bd
Merge branch 'fix-grayalpha-9patch' of https://github.com/phhusson/Apktool into phhusson-fix-grayalpha-9patch 2017-05-25 07:00:00 -04:00