Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit fb938a2

Browse files
osuleymanovakeyboardsurfer
authored andcommitted
Bumps versions update for AFox
Kotlin and Gradle Plugin versions updated ...kotlin-stdlib-jdk7.. line removed android:exported="true" in Manifests set libraries versions updated jcenter() replaced with mavenCentral() android.useAndroidX=true added otherwise build failed
1 parent 5969d8f commit fb938a2

File tree

8 files changed

+21
-17
lines changed

8 files changed

+21
-17
lines changed

app/build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ dependencies {
5252
// Libraries which can be re-used in other modules should use the `api` keyword.
5353
// This way they can be shared with dependent feature modules.
5454

55-
implementation 'androidx.annotation:annotation:1.1.0'
56-
implementation 'androidx.appcompat:appcompat:1.1.0'
57-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
58-
api 'com.google.android.material:material:1.0.0'
55+
implementation 'androidx.annotation:annotation:1.3.0'
56+
implementation 'androidx.appcompat:appcompat:1.4.0'
57+
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
58+
api 'com.google.android.material:material:1.4.0'
5959
api "com.google.android.play:core:${versions.playcore}"
60-
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
6160
}

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
android:roundIcon="@mipmap/ic_launcher_round"
2727
android:supportsRtl="true"
2828
android:theme="@style/AppTheme">
29-
<activity android:name=".MainActivity">
29+
<activity android:name=".MainActivity"
30+
android:exported="true">
3031
<intent-filter>
3132
<action android:name="android.intent.action.MAIN" />
3233
<action android:name="android.intent.action.VIEW" />

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
buildscript {
2020

2121
ext.versions = [
22-
'compileSdk' : 29,
22+
'compileSdk' : 31,
2323
'minSdk' : 16,
24-
'targetSdk' : 29,
25-
'kotlin' : '1.3.50',
26-
'playcore' : '1.6.4',
24+
'targetSdk' : 31,
25+
'kotlin' : '1.6.10',
26+
'playcore' : '1.10.3',
2727
]
2828

2929
ext.names = [
@@ -32,10 +32,10 @@ buildscript {
3232

3333
repositories {
3434
google()
35-
jcenter()
35+
mavenCentral()
3636
}
3737
dependencies {
38-
classpath 'com.android.tools.build:gradle:3.5.2'
38+
classpath 'com.android.tools.build:gradle:7.0.4'
3939
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
4040

4141
// NOTE: Do not place your application dependencies here; they belong
@@ -46,6 +46,6 @@ buildscript {
4646
allprojects {
4747
repositories {
4848
google()
49-
jcenter()
49+
mavenCentral()
5050
}
5151
}

features/java/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
</dist:module>
2828

2929
<application>
30-
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.JavaSampleActivity">
30+
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.JavaSampleActivity"
31+
android:exported="true">
3132
<intent-filter>
3233
<action android:name="android.intent.action.VIEW" />
3334
</intent-filter>

features/kotlin/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
</dist:module>
2828

2929
<application>
30-
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.KotlinSampleActivity">
30+
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.KotlinSampleActivity"
31+
android:exported="true">
3132
<intent-filter>
3233
<action android:name="android.intent.action.VIEW" />
3334
</intent-filter>

features/native/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
</dist:module>
2828

2929
<application>
30-
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.NativeSampleActivity">
30+
<activity android:name="com.google.android.samples.dynamicfeatures.ondemand.NativeSampleActivity"
31+
android:exported="true">
3132
<intent-filter>
3233
<action android:name="android.intent.action.VIEW" />
3334
</intent-filter>

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ org.gradle.jvmargs=-Xmx1536m
2727
# This option should only be used with decoupled projects. More details, visit
2828
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2929
# org.gradle.parallel=true
30+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

0 commit comments

Comments
 (0)