packer-ng v2 released

.gitignore

@@ -3,8 +3,16 @@
 build/
 apks/
 repo/
+dist/
+tmp/
 *.iml
 *.apk
 *.pyc
+*.d
+*.o
+*.class
 .DS_Store
-packer.properties
+a.out
+.classpath
+.project
+.settings/

app/build.gradle

@@ -0,0 +1,117 @@
+buildscript {
+    ext.packer_version = '2.0.0-SNAPSHOT'
+
+    repositories {
+        maven { url '/tmp/repo/' }
+        jcenter()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    }
+
+    dependencies {
+        classpath "com.android.tools.build:gradle:2.2.3"
+        classpath "com.mcxiaoke.packer-ng:plugin:$packer_version"
+    }
+}
+
+repositories {
+    maven { url '/tmp/repo/' }
+    jcenter()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'packer'
+
+// https://code.google.com/p/android/issues/detail?id=171089
+dependencies {
+    compile "com.mcxiaoke.packer-ng:helper:$packer_version"
+}
+
+//packer-begin
+packer {
+    archiveNameFormat = '${appPkg}-${buildType}-v${versionName}-${channel}'
+    archiveOutput = new File(project.rootProject.buildDir, "apks")
+//    channelList = ['*Douban*', 'Google/', '中文/@#市场', 'Hello@World',
+//                   'GradleTest', '20070601!@#$%^&*(){}:"<>?-=[];\',./']
+//    channelFile = new File(project.rootDir, "channels.txt")
+    channelMap = [
+            "free" : project.rootProject.file("channels/free.txt"),
+            "paid" : project.rootProject.file("channels/paid.txt"),
+            "other": project.rootProject.file("channels/channels.txt")
+    ]
+}
+//packer-end
+
+android {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+        encoding "UTF-8"
+    }
+
+    compileSdkVersion project.compileSdkVersion
+    buildToolsVersion project.buildToolsVersion
+
+    defaultConfig {
+        versionName project.VERSION_NAME
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+    }
+
+    signingConfigs {
+        v2 {
+            storeFile file("android.keystore")
+            storePassword "android"
+            keyAlias "android"
+            keyPassword "android"
+            v2SigningEnabled true
+        }
+
+        v1 {
+            storeFile file("android.keystore")
+            storePassword "android"
+            keyAlias "android"
+            keyPassword "android"
+            v2SigningEnabled false
+        }
+
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.v2
+            minifyEnabled false
+        }
+
+        beta {
+            signingConfig signingConfigs.v1
+            minifyEnabled false
+        }
+
+        alpha {
+            minifyEnabled false
+        }
+
+    }
+
+    productFlavors {
+        free {}
+
+        paid {}
+
+        other {}
+    }
+
+    lintOptions {
+        abortOnError false
+        htmlReport true
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'META-INF/services/javax.annotation.processing.Processor'
+    }
+
+}

app/gradle.properties

@@ -0,0 +1 @@
+

sample/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mcxiaoke.packer.ng.sample">
+    package="com.mcxiaoke.packer.samples">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:label="PackerNg">
 
         <activity
-            android:name="com.mcxiaoke.packer.samples.MainActivity"
-            android:label="@string/app_name">
+            android:name=".MainActivity"
+            android:label="PackerNg">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/mcxiaoke/packer/samples/MainActivity.java

@@ -0,0 +1,43 @@
+package com.mcxiaoke.packer.samples;
+
+import android.app.Activity;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.TextView;
+import com.mcxiaoke.packer.helper.PackerNg;
+
+import java.io.File;
+import java.util.List;
+
+
+public class MainActivity extends Activity {
+    private static final String TAG = "PackerNg";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TextView v = new TextView(this);
+        LayoutParams p = new LayoutParams(-1, -1);
+        setContentView(v, p);
+        v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 40);
+        v.setGravity(Gravity.CENTER);
+        v.setPadding(40, 40, 40, 40);
+        v.setText(PackerNg.getChannel(this));
+
+        PackageManager pm = getPackageManager();
+        List<ApplicationInfo> apps = pm.getInstalledApplications(PackageManager.GET_META_DATA);
+        for (ApplicationInfo app : apps) {
+            if (app.packageName.startsWith("com.douban.")) {
+                Log.d("TAG", "app=" + app.packageName + ", channel="
+                        + PackerNg.getChannel(new File(app.sourceDir)));
+            }
+        }
+
+    }
+
+}

build.gradle

@@ -0,0 +1,9 @@
+ext {
+    compileSdkVersion = 25
+    buildToolsVersion = "25.0.3"
+    minSdkVersion = 14
+    targetSdkVersion = 22
+}
+
+group = GROUP
+version = VERSION_NAME

channels/channels.txt

@@ -0,0 +1,16 @@
+Google_Market#Google电子市场
+Hiapk_Market#安卓市场
+Yingyonghui_Market#应用汇市场
+ali_market#阿里云商店
+Xiaomi_Market#小米市场
+Yingyongbao_Market#腾讯应用宝市场
+Samsung_Market#三星市场
+OPPO_Market#OPPO市场
+Huawei_Market#华为市场
+amazon_market#亚马逊市场
+Meizu_Market#魅族市场
+3G_market#3G安卓市场
+WanDouJia_Parter#豌豆荚
+Baidu_Market#百度应用中心
+360_Market#360手机助手
+Taobao_Market#淘宝应用市场

channels/free.txt

@@ -0,0 +1,7 @@
+Cat1#hello2
+cat2#哈哈哈
+BigCat#hello1
+田园猫
+橘Cat#gogogo
+GoodCat
+Special@Cat%001 # oooo

channels/paid.txt

@@ -0,0 +1,4 @@
+Dog1
+Dog2#d1
+Dog3#d5
+金毛# it is a dog

cli/build.gradle

@@ -0,0 +1,49 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+apply plugin: 'java'
+//apply plugin: 'application'
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+dependencies {
+    compile project(":common")
+    compile 'com.android.tools.build:apksig:2.3.2'
+}
+
+//mainClassName = 'com.mcxiaoke.packer.cli.Main'
+
+task fatJar(type: Jar) {
+    with jar
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    manifest {
+        attributes('Implementation-Title': 'PackerNg 2 Executable Jar',
+                'Implementation-Version': VERSION_NAME,
+                'Main-Class': 'com.mcxiaoke.packer.cli.Main',
+                'Description': 'This is PackerNg 2 executable Jar.',
+                'Owner': 'packer-ng-plugin@mcxiaoke.com',
+                'Project': 'https://github.com/mcxiaoke/packer-ng-plugin')
+    }
+    baseName = 'packer-ng'
+
+}
+
+task distJar(type: Copy, dependsOn: fatJar) {
+    from fatJar.outputs.files
+    into project.rootProject.file('tools')
+}
+
+// apply from: '../jar.gradle'
+apply from: '../gradle-mvn-push.gradle'

cli/gradle.properties

@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=cli
+POM_PACKAGING=jar
+POM_NAME=Commandline Classes for Packer-Ng

cli/src/main/java/com/mcxiaoke/packer/cli/Bridge.java

@@ -0,0 +1,47 @@
+package com.mcxiaoke.packer.cli;
+
+import com.android.apksig.ApkVerifier;
+import com.android.apksig.ApkVerifier.Builder;
+import com.android.apksig.ApkVerifier.Result;
+import com.android.apksig.apk.ApkFormatException;
+import com.mcxiaoke.packer.common.PackerCommon;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * User: mcxiaoke
+ * Date: 2017/5/26
+ * Time: 16:21
+ */
+public class Bridge {
+
+    public static void writeChannel(File file, String channel) throws IOException {
+        PackerCommon.writeChannel(file, channel);
+    }
+
+    public static String readChannel(File file) throws IOException {
+        return PackerCommon.readChannel(file);
+    }
+
+    public static boolean verifyChannel(File file, String channel) throws IOException {
+        return verifyApk(file) && (channel.equals(readChannel(file)));
+    }
+
+    public static boolean verifyApk(File file) throws IOException {
+        ApkVerifier verifier = new Builder(file).build();
+        try {
+            Result result = verifier.verify();
+            return result.isVerified()
+                    && result.isVerifiedUsingV1Scheme()
+                    && result.isVerifiedUsingV2Scheme();
+        } catch (ApkFormatException e) {
+            throw new IOException(e);
+        } catch (NoSuchAlgorithmException e) {
+            throw new IOException(e);
+        }
+
+    }
+
+}