Skip to content

Commit 501eb51

Browse files
fix build error
remove the .idea directory
1 parent eca05d1 commit 501eb51

File tree

14 files changed

+270
-379
lines changed

14 files changed

+270
-379
lines changed

.gitignore

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# built application files
2+
*.apk
3+
*.ap_
4+
5+
# lint folder
6+
lint
7+
8+
# files for the dex VM
9+
*.dex
10+
11+
# Java class files
12+
*.class
13+
14+
# generated files
15+
bin/
16+
gen/
17+
classes/
18+
gen-external-apklibs/
19+
20+
# maven output folder
21+
target
22+
23+
# OSX files
24+
.DS_Store
25+
26+
# Windows files
27+
Thumbs.db
28+
29+
# vi swap files
30+
*.swp
31+
32+
# backup files
33+
*.bak
34+
35+
# Android Studio
36+
*.iml
37+
*.ipr
38+
*.iws
39+
.idea/
40+
41+
# dummy
42+
*.classpath
43+
*.settings/
44+
*local.properties
45+
46+
.gradle
47+
/build
48+
/captures
49+
50+

.idea/assetWizardSettings.xml

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

.idea/codeStyles/Project.xml

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

.idea/dictionaries/metecanduyal.xml

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

.idea/gradle.xml

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

.idea/misc.xml

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

.idea/runConfigurations.xml

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

app/build.gradle

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

77
android {
8-
compileSdkVersion 28
8+
namespace "app.layout.motion.motionlayoutexample"
9+
compileSdkVersion 31
910
defaultConfig {
1011
applicationId "app.layout.motion.motionlayoutexample"
11-
minSdkVersion 18
12-
targetSdkVersion 29
12+
minSdkVersion 21
13+
targetSdkVersion 31
1314
versionCode 1
1415
versionName "1.0"
1516
vectorDrawables.useSupportLibrary = true
@@ -24,16 +25,16 @@ android {
2425
}
2526

2627
dependencies {
27-
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29-
implementation 'androidx.appcompat:appcompat:1.1.0'
28+
// implementation fileTree(dir: 'libs', include: ['*.jar'])
29+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10"
30+
implementation 'androidx.appcompat:appcompat:1.4.1'
3031
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
31-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
32-
implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.0-beta3'
33-
implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
34-
implementation 'de.hdodenhof:circleimageview:2.2.0'
35-
implementation 'androidx.fragment:fragment:1.2.0-rc02'
36-
testImplementation 'junit:junit:4.12'
37-
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
38-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
32+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
33+
implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.4'
34+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
35+
implementation 'de.hdodenhof:circleimageview:3.1.0'
36+
implementation 'androidx.fragment:fragment:1.4.1'
37+
testImplementation 'junit:junit:4.13.2'
38+
androidTestImplementation 'androidx.test:runner:1.4.0'
39+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
3940
}

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="app.layout.motion.motionlayoutexample">
3+
>
44

55
<application
66
android:allowBackup="true"
@@ -10,7 +10,9 @@
1010
android:hardwareAccelerated="true"
1111
android:supportsRtl="true"
1212
android:theme="@style/AppTheme">
13-
<activity android:name=".MainActivity">
13+
<activity android:name=".MainActivity"
14+
android:exported="true"
15+
>
1416
<intent-filter>
1517
<action android:name="android.intent.action.MAIN" />
1618

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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.3.50'
4+
ext.kotlin_version = '1.6.10'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.5.2'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10+
classpath 'com.android.tools.build:gradle:8.1.0'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

0 commit comments

Comments
 (0)