Upgrade AGP version

iqiyi · Oct 30, 2019 · c16f634 · c16f634
1 parent e707c85
commit c16f634
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,7 +47,13 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-    dynamicFeatures = [':java', ':assets', ":native"]
+
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
+
+    dynamicFeatures = [':java', ':assets', ':native']
 }
 
 def qigsawPath = file("qigsaw/")

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">Qigsaw</string>
-    <string name="module_java">Module Title</string>
-    <string name="module_assets">Module Title</string>
-    <string name="module_native">Module Title</string>
+    <string name="module_java">java</string>
+    <string name="module_assets">assets</string>
+    <string name="module_native">native</string>
     <string name="load_feature_kotlin">Start Kotlin Feature</string>
     <string name="load_feature_java">Start Java Feature</string>
     <string name="load_native_code">Start Native Feature</string>

diff --git a/features/java/src/main/AndroidManifest.xml b/features/java/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
     </application>
 
     <dist:module
-        dist:onDemand="true"
+        dist:onDemand="false"
         dist:title="@string/module_java">
         <dist:fusing dist:include="true" />
     </dist:module>

diff --git a/features/native/src/main/AndroidManifest.xml b/features/native/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
 
     <application>
         <activity android:name=".NativeSampleActivity">
-
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+            </intent-filter>
         </activity>
     </application>
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 JAVA_VERSION=1.7
-AGP_VERSION=3.3.2
+AGP_VERSION=3.4.1
 GROUP_ID=com.iqiyi.android.qigsaw
 VERSION_NAME=1.1.5-rc01
 BINTRAY_REPO=maven

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists