Delta Between Two Patch Sets: libadblockplus-android-webview/pom.xml
Issue 29351744:
Issue 4399 - Add WebView inheritor with ad blocking (Closed)
Left Patch Set: moved from experimental gradle plugin to standard one (with new ndk support)
Created Oct. 7, 2016, 9:48 a.m.
Right Patch Set: changed packages, now using AdblockEngine (original ABPEngine), improved demo app
Created Oct. 25, 2016, 11:20 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« libadblockplus-android-webview/build.xml ('k')
|
libadblockplus-android-webview/project.properties » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <project | 2 <project |
| 3 xmlns="http://maven.apache.org/POM/4.0.0" | 3 xmlns="http://maven.apache.org/POM/4.0.0" |
| 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 5 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apach e.org/maven-v4_0_0.xsd"> | 5 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apach e.org/maven-v4_0_0.xsd"> |
| 6 <modelVersion>4.0.0</modelVersion> | 6 <modelVersion>4.0.0</modelVersion> |
| 7 | 7 |
| 8 <parent> | 8 <parent> |
| 9 <groupId>org.adblockplus</groupId> | 9 <groupId>org.adblockplus.libadblockplus.android</groupId> |
| 10 <artifactId>libadblockplus-android-parent</artifactId> | 10 <artifactId>parent</artifactId> |
| 11 <version>1.0</version> | 11 <version>1.0</version> |
| 12 </parent> | 12 </parent> |
| 13 | 13 |
| 14 <groupId>org.adblockplus</groupId> | 14 <groupId>org.adblockplus.libadblockplus.android</groupId> |
| 15 <artifactId>libadblockplus-android-webview</artifactId> | 15 <artifactId>webview</artifactId> |
| 16 <version>${selfVersion}</version> | 16 <version>${selfVersion}</version> |
| 17 <packaging>aar</packaging> | 17 <packaging>aar</packaging> |
| 18 <name>libadblockplus-android-webview</name> | 18 <name>libadblockplus-android-webview</name> |
| 19 | 19 |
| 20 <dependencies> | 20 <dependencies> |
| 21 <!-- android --> | 21 <!-- android --> |
| 22 <dependency> | 22 <dependency> |
| 23 <groupId>com.google.android</groupId> | 23 <groupId>com.google.android</groupId> |
| 24 <artifactId>android</artifactId> | 24 <artifactId>android</artifactId> |
| 25 <version>5.0</version> <!-- 5.0 = target-21 --> | 25 <version>5.0</version> <!-- 5.0 = target-21 --> |
| 26 <type>jar</type> | 26 <type>jar</type> |
| 27 <scope>provided</scope> | 27 <scope>provided</scope> |
| 28 </dependency> | 28 </dependency> |
| 29 | 29 |
| 30 <!-- library --> | 30 <!-- library --> |
| 31 <dependency> | 31 <dependency> |
| 32 <groupId>org.adblockplus</groupId> | 32 <groupId>org.adblockplus.libadblockplus.android</groupId> |
| 33 <artifactId>libadblockplus-android</artifactId> | 33 <artifactId>library</artifactId> |
| 34 <version>${selfVersion}</version> | 34 <version>${selfVersion}</version> |
| 35 <type>aar</type> | 35 <type>aar</type> |
| 36 </dependency> | 36 </dependency> |
| 37 </dependencies> | 37 </dependencies> |
| 38 | 38 |
| 39 <build> | 39 <build> |
| 40 <sourceDirectory>${basedir}/src</sourceDirectory> | 40 <sourceDirectory>${basedir}/src</sourceDirectory> |
| 41 <plugins> | 41 <plugins> |
| 42 | 42 |
| 43 <!-- compile java code and package --> | 43 <!-- compile java code and package --> |
| 44 <plugin> | 44 <plugin> |
| 45 <groupId>com.simpligility.maven.plugins</groupId> | 45 <groupId>com.simpligility.maven.plugins</groupId> |
| 46 <artifactId>android-maven-plugin</artifactId> | 46 <artifactId>android-maven-plugin</artifactId> |
| 47 <version>4.4.1</version> | 47 <version>4.4.1</version> |
| 48 <configuration> | 48 <configuration> |
| 49 <sdk> | 49 <sdk> |
| 50 <platform>21</platform> | 50 <platform>21</platform> |
| 51 <!-- <buildTools>${buildTools}</buildTools> --> | |
| 52 </sdk> | 51 </sdk> |
| 53 <ndk> | 52 <ndk> |
| 54 <path>${env.ANDROID_NDK_HOME}</path> | 53 <path>${env.ANDROID_NDK_HOME}</path> |
| 55 </ndk> | 54 </ndk> |
| 56 | 55 |
| 57 <!-- specific files locations --> | 56 <!-- specific files locations --> |
| 58 <androidManifestFile>AndroidManifest.xml</androidManifestFil e> | 57 <androidManifestFile>AndroidManifest.xml</androidManifestFil e> |
| 59 <resourceDirectory>res</resourceDirectory> | 58 <resourceDirectory>res</resourceDirectory> |
| 60 <nativeLibrariesDirectory>libs</nativeLibrariesDirectory> | 59 <nativeLibrariesDirectory>libs</nativeLibrariesDirectory> |
| 61 <assetsDirectory>assets</assetsDirectory> | 60 <assetsDirectory>assets</assetsDirectory> |
| 62 | 61 |
| 63 </configuration> | 62 </configuration> |
| 64 <extensions>true</extensions> | 63 <extensions>true</extensions> |
| 65 </plugin> | 64 </plugin> |
| 66 | 65 |
| 67 </plugins> | 66 </plugins> |
| 68 </build> | 67 </build> |
| 69 | 68 |
| 70 </project> | 69 </project> |
| LEFT | RIGHT |
« libadblockplus-android-webview/build.xml ('k')
|
libadblockplus-android-webview/project.properties » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
