Delta Between Two Patch Sets: libadblockplus-android/pom.xml
Issue 29351744:
Issue 4399 - Add WebView inheritor with ad blocking (Closed)
Left Patch Set: updated Ant/Maven build configuration files
Created Oct. 3, 2016, 6:57 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/jni/Utils.cpp ('k')
|
libadblockplus-android/src/org/adblockplus/android/AndroidWebRequest.java » ('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 <groupId>org.adblockplus</groupId> | 8 <parent> |
| 9 <artifactId>libadblockplus-android</artifactId> | 9 <groupId>org.adblockplus.libadblockplus.android</groupId> |
| 10 <version>1.0</version> | 10 <artifactId>parent</artifactId> |
| 11 » <packaging>aar</packaging> | 11 <version>1.0</version> |
| 12 </parent> | |
| 13 | |
| 14 <groupId>org.adblockplus.libadblockplus.android</groupId> | |
| 15 <artifactId>library</artifactId> | |
| 16 <version>${selfVersion}</version> | |
| 17 <packaging>aar</packaging> | |
| 12 <name>libadblockplus-android</name> | 18 <name>libadblockplus-android</name> |
| 13 <description>AdBlock Plus JNI Binding Library</description> | |
| 14 | 19 |
| 15 <dependencies> | 20 <dependencies> |
| 16 <!-- android --> | 21 <!-- android --> |
| 17 <dependency> | 22 <dependency> |
| 18 <groupId>com.google.android</groupId> | 23 <groupId>com.google.android</groupId> |
| 19 <artifactId>android</artifactId> | 24 <artifactId>android</artifactId> |
| 20 <version>5.0</version> <!-- 5.0 = target-21 --> | 25 <version>[4.1,)</version> <!-- 4.1 = target-16 --> |
| 21 <type>jar</type> | 26 <type>jar</type> |
| 22 <scope>provided</scope> | 27 <scope>provided</scope> |
| 23 </dependency> | 28 </dependency> |
| 24 </dependencies> | 29 </dependencies> |
| 25 | 30 |
| 26 <build> | 31 <build> |
| 27 <sourceDirectory>${basedir}/src</sourceDirectory> | 32 <sourceDirectory>${basedir}/src</sourceDirectory> |
| 28 <plugins> | 33 <plugins> |
| 29 <!-- clean or compile native libraries using Ant --> | 34 <!-- clean or compile native libraries using Ant --> |
| 30 <plugin> | 35 <plugin> |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 61 <!-- compile java code and package --> | 66 <!-- compile java code and package --> |
| 62 <plugin> | 67 <plugin> |
| 63 <groupId>com.simpligility.maven.plugins</groupId> | 68 <groupId>com.simpligility.maven.plugins</groupId> |
| 64 <artifactId>android-maven-plugin</artifactId> | 69 <artifactId>android-maven-plugin</artifactId> |
| 65 <version>4.4.1</version> | 70 <version>4.4.1</version> |
| 66 <goals> | 71 <goals> |
| 67 <goal>ndk-build</goal> | 72 <goal>ndk-build</goal> |
| 68 </goals> | 73 </goals> |
| 69 <configuration> | 74 <configuration> |
| 70 <sdk> | 75 <sdk> |
| 71 <platform>21</platform> | 76 <platform>16</platform> |
| 72 </sdk> | 77 </sdk> |
| 73 <ndk> | 78 <ndk> |
| 74 <path>${env.ANDROID_NDK_HOME}</path> | 79 <path>${env.ANDROID_NDK_HOME}</path> |
| 75 </ndk> | 80 </ndk> |
| 76 | 81 |
| 77 <!-- specific files locations --> | 82 <!-- specific files locations --> |
| 78 <androidManifestFile>AndroidManifest.xml</androidManifestFil e> | 83 <androidManifestFile>AndroidManifest.xml</androidManifestFil e> |
| 79 <resourceDirectory>res</resourceDirectory> | 84 <resourceDirectory>res</resourceDirectory> |
| 80 <nativeLibrariesDirectory>libs</nativeLibrariesDirectory> | 85 <nativeLibrariesDirectory>libs</nativeLibrariesDirectory> |
| 81 <assetsDirectory>assets</assetsDirectory> | |
| 82 | 86 |
| 83 </configuration> | 87 </configuration> |
| 84 <extensions>true</extensions> | 88 <extensions>true</extensions> |
| 85 </plugin> | 89 </plugin> |
| 86 | 90 |
| 87 </plugins> | 91 </plugins> |
| 88 </build> | 92 </build> |
| 89 | 93 |
| 90 </project> | 94 </project> |
| LEFT | RIGHT |
« libadblockplus-android/jni/Utils.cpp ('k')
|
libadblockplus-android/src/org/adblockplus/android/AndroidWebRequest.java » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
