Skip to content

Commit 9a53104

Browse files
author
Greg Cockroft
committed
Update to Android 12
1 parent d9c4043 commit 9a53104

File tree

11 files changed

+80
-24
lines changed

11 files changed

+80
-24
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 27
8+
compileSdkVersion 32
99
defaultConfig {
1010
applicationId "com.agog.hellomath"
1111
minSdkVersion 23
12-
targetSdkVersion 27
12+
targetSdkVersion 32
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,11 +24,11 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
28-
implementation 'com.android.support:appcompat-v7:27.1.1'
27+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
28+
implementation 'com.android.support:appcompat-v7:28.0.0'
2929
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
30-
testImplementation 'junit:junit:4.12'
30+
implementation 'junit:junit:4.13.2'
3131
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3232
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
33-
implementation 'com.github.gregcockroft:AndroidMath:TESTA'
33+
implementation 'com.github.gregcockroft:AndroidMath:v1.0.0'
3434
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
12+
13+
<activity android:name=".MainActivity"
14+
android:exported="true">
1315
<intent-filter>
1416
<action android:name="android.intent.action.MAIN" />
1517

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.41'
4+
ext.kotlin_version = '1.6.10'
55
repositories {
66
google()
7+
mavenCentral()
78
jcenter()
89
maven { url 'https://jitpack.io' }
910
}
1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.1.2'
12+
classpath 'com.android.tools.build:gradle:7.0.4'
1213
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1315

1416
// NOTE: Do not place your application dependencies here; they belong
1517
// in the individual module build.gradle files
@@ -19,6 +21,7 @@ buildscript {
1921
allprojects {
2022
repositories {
2123
google()
24+
mavenCentral()
2225
jcenter()
2326
maven { url 'https://jitpack.io' }
2427
}

gradle/wrapper/gradle-wrapper.jar

-295 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)