Commit a078315d authored by 张释方's avatar 张释方

修改git

parent c851ebe5
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mints.library_ad;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mints.library_ad";
public static final String BUILD_TYPE = "debug";
}
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mints.library_ad"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="30" />
</manifest>
\ No newline at end of file
{
"version": 2,
"artifactType": {
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
"kind": "Directory"
},
"applicationId": "com.mints.library_ad",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"outputFile": "AndroidManifest.xml"
}
]
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\main\assets"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\main\res"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\rs\debug"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\main\res"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\rs\debug"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mints.library_ad"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="30" />
</manifest>
\ No newline at end of file
R_DEF: Internal format may change without notice
local
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.mints.library_ad"
4 android:versionCode="1"
5 android:versionName="1.0" >
6
7 <uses-sdk
8 android:minSdkVersion="21"
8-->D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
9 android:targetSdkVersion="30" />
9-->D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
10
11</manifest>
{
"version": 2,
"artifactType": {
"type": "PACKAGED_MANIFESTS",
"kind": "Directory"
},
"applicationId": "com.mints.library_ad",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"outputFile": "../../library_manifest/debug/AndroidManifest.xml"
}
]
}
\ No newline at end of file
-- Merging decision tree log ---
manifest
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
package
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:3:5-35
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:11-69
uses-sdk
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
com/mints/library_ad/BuildConfig.java
com.mints.library_ad.BuildConfig
#Mon Jul 05 16:07:07 CST 2021 #Mon Jul 05 16:26:55 CST 2021
VERSION_BUILD=2498 VERSION_BUILD=2499
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment