Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
查郁 committed Nov 23, 2017
1 parent 41d85a6 commit 946b598
Show file tree
Hide file tree
Showing 50 changed files with 12 additions and 9,786 deletions.
2 changes: 1 addition & 1 deletion atlas-demo/AtlasDemo/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ atlas {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile('com.taobao.android:atlas_core:5.0.8.0-SNAPSHOT@aar') {
compile('com.taobao.android:atlas_core:5.0.7.52-rc52@aar') {

transitive = true
}
Expand Down
2 changes: 1 addition & 1 deletion atlas-demo/AtlasDemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
dependencies {
classpath "com.taobao.android:atlasplugin:2.3.3.rc35-gj-SNAPSHOT"
classpath "com.taobao.android:atlasplugin:2.3.3.rc37"
}
}

Expand Down
2 changes: 1 addition & 1 deletion atlas-docs/guide-for-use/guide_for_build.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 主工程容器接入
# 主工程容器接入
Atlas开源的代码内容主要包括以下几个模块：

1. 基于gradle的构建插件（包括修改过的aapt内容）；
Expand Down
2 changes: 1 addition & 1 deletion atlas-gradle-plugin/atlas-plugin/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,4 @@ dependencies {
}


version = '2.3.3.rc37'
version = '2.3.3.rc38-zy'
2 changes: 1 addition & 1 deletion ...e-plugin/atlas-plugin/src/main/java/com/taobao/android/builder/extension/PatchConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public Set<String> getExcludeClasses() {
if (excludeClasses.size() > 0){
return excludeClasses;
}else {
return Sets.newHashSet("Landroid/taobao/atlas/framework/FrameworkProperties;","Landroid/taobao/atlas/bundleInfo/AtlasBundleInfoGenerator;");
return Sets.newHashSet("Landroid/taobao/atlas/framework/FrameworkProperties;","Landroid/taobao/atlas/bundleInfo/AtlasBundleInfoGenerator;","Lc8/As;");
}
}

Expand Down
2 changes: 1 addition & 1 deletion atlas-gradle-plugin/dexpatch/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ dependencies {

group 'com.taobao.android'

version "1.4.4.13"
version "1.4.4.13-zy"

2 changes: 1 addition & 1 deletion ...gradle-plugin/dexpatch/src/main/java/com/taobao/android/dx/cf/direct/DirectClassFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class DirectClassFile implements ClassFile {
*
* Note: if you change this, please change "java.class.version" in System.java.
*/
private static final int CLASS_FILE_MAX_MAJOR_VERSION = 51;
private static final int CLASS_FILE_MAX_MAJOR_VERSION = 52;

/** maximum {@code .class} file minor version */
private static final int CLASS_FILE_MAX_MINOR_VERSION = 0;
Expand Down
12 changes: 3 additions & 9 deletions atlas-update/atlasupdate.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
Expand All @@ -20,7 +19,7 @@
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
<option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
Expand All @@ -46,46 +45,41 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.taobao.android/atlas_core/5.0.7.34-beta1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.taobao.android/atlas_core/5.0.7.52-rc7-SNAPSHOT/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
Expand All @@ -105,7 +99,7 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="reactive-streams-1.0.0" level="project" />
<orderEntry type="library" exported="" name="atlas_core-5.0.7.34-beta1" level="project" />
<orderEntry type="library" exported="" name="atlas_core-5.0.7.52-rc7-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="rxjava-2.0.1" level="project" />
</component>
</module>
4 changes: 2 additions & 2 deletions atlas-update/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
//apply plugin: 'maven-publish'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply from: 'http://gitlab.alibaba-inc.com/android-build-system/buildscript/raw/master/mtl-publish.gradle'
//apply from: 'http://gitlab.alibaba-inc.com/android-build-system/buildscript/raw/master/mtl-publish.gradle'


android {
Expand All @@ -43,7 +43,7 @@ repositories {
}

dependencies {
compile 'com.taobao.android:atlas_core:5.0.7.52-rc7-SNAPSHOT'
compile 'com.taobao.android:atlas_core:5.0.7.52-rc7'
compile 'io.reactivex.rxjava2:rxjava:2.0.1'
compile 'org.reactivestreams:reactive-streams:1.0.0@jar'
}
Expand Down
52 changes: 0 additions & 52 deletions atlas-update/src/main/java/com/taobao/dex/Annotation.java
View file

This file was deleted.

56 changes: 0 additions & 56 deletions atlas-update/src/main/java/com/taobao/dex/AnnotationSet.java
View file

This file was deleted.

57 changes: 0 additions & 57 deletions atlas-update/src/main/java/com/taobao/dex/AnnotationSetRefList.java
View file

This file was deleted.

Loading

0 comments on commit 946b598

Please sign in to comment.