Skip to content

Commit

Permalink
fix build error
Browse files Browse the repository at this point in the history
remove the .idea directory
  • Loading branch information
JianqingPengSAP committed Sep 14, 2023
1 parent eca05d1 commit 501eb51
Show file tree
Hide file tree
Showing 14 changed files with 270 additions and 379 deletions.
50 changes: 50 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# built application files
*.apk
*.ap_

# lint folder
lint

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/
classes/
gen-external-apklibs/

# maven output folder
target

# OSX files
.DS_Store

# Windows files
Thumbs.db

# vi swap files
*.swp

# backup files
*.bak

# Android Studio
*.iml
*.ipr
*.iws
.idea/

# dummy
*.classpath
*.settings/
*local.properties

.gradle
/build
/captures


32 changes: 0 additions & 32 deletions .idea/assetWizardSettings.xml

This file was deleted.

113 changes: 0 additions & 113 deletions .idea/codeStyles/Project.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/dictionaries/metecanduyal.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

52 changes: 0 additions & 52 deletions .idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

29 changes: 15 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 28
namespace "app.layout.motion.motionlayoutexample"
compileSdkVersion 31
defaultConfig {
applicationId "app.layout.motion.motionlayoutexample"
minSdkVersion 18
targetSdkVersion 29
minSdkVersion 21
targetSdkVersion 31
versionCode 1
versionName "1.0"
vectorDrawables.useSupportLibrary = true
Expand All @@ -24,16 +25,16 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
// implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.0-beta3'
implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'androidx.fragment:fragment:1.2.0-rc02'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.4'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'androidx.fragment:fragment:1.4.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="app.layout.motion.motionlayoutexample">
>

<application
android:allowBackup="true"
Expand All @@ -10,7 +10,9 @@
android:hardwareAccelerated="true"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity"
android:exported="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.6.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Sep 14 23:06:14 CST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 501eb51

Please sign in to comment.