Skip to content

Commit 772cb43

Browse files
Update project gradle structure and dependencies
1 parent 0c8f085 commit 772cb43

10 files changed

+50
-66
lines changed

.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

-13
This file was deleted.

app/build.gradle

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id 'com.android.application'
3+
id 'org.jetbrains.kotlin.android'
4+
}
35

46
android {
5-
compileSdkVersion 30
6-
buildToolsVersion '30.0.3'
7+
namespace "com.alibardide.imagine"
8+
compileSdk 33
79

810
defaultConfig {
911
applicationId "com.alibardide.imagine"
10-
minSdkVersion 17
11-
targetSdkVersion 30
12-
versionCode 2
13-
versionName "1.0.1"
12+
minSdk 21
13+
targetSdk 33
14+
versionCode 3
15+
versionName '1.2.0'
1416
vectorDrawables.useSupportLibrary = true
1517
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1618
}
@@ -36,13 +38,12 @@ android {
3638
}
3739

3840
dependencies {
39-
implementation fileTree(dir: "libs", include: ["*.jar"])
40-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
41-
implementation 'androidx.core:core-ktx:1.6.0'
42-
implementation 'androidx.appcompat:appcompat:1.3.1'
43-
implementation 'com.google.android.material:material:1.4.0'
44-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
45-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
41+
42+
implementation 'androidx.core:core-ktx:1.9.0'
43+
implementation 'androidx.appcompat:appcompat:1.6.0-alpha01'
44+
implementation 'com.google.android.material:material:1.8.0'
45+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha08'
46+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
4647

4748
implementation 'id.zelory:compressor:3.0.1'
4849
implementation 'com.vmadalin:easypermissions-ktx:1.0.0'

app/src/main/AndroidManifest.xml

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.alibardide.imagine">
3+
xmlns:tools="http://schemas.android.com/tools">
44

55
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
6-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
7-
android:maxSdkVersion="28"/>
6+
<uses-permission
7+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
8+
android:maxSdkVersion="28" />
89

910
<application
1011
android:allowBackup="true"
1112
android:icon="@mipmap/ic_launcher"
1213
android:label="@string/app_name"
13-
android:supportsRtl="true"
14-
android:theme="@style/AppTheme">
15-
<activity android:name=".MainActivity">
14+
android:supportsRtl="false"
15+
android:theme="@style/AppTheme"
16+
tools:targetApi="31">
17+
<activity
18+
android:name=".MainActivity"
19+
android:exported="true">
1620
<intent-filter>
1721
<action android:name="android.intent.action.MAIN" />
1822

build.gradle

+4-25
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
buildscript {
3-
ext.kotlin_version = "1.5.10"
4-
repositories {
5-
google()
6-
mavenCentral()
7-
}
8-
9-
dependencies {
10-
classpath "com.android.tools.build:gradle:4.2.2"
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
13-
// NOTE: Do not place your application dependencies here; they belong
14-
// in the individual module build.gradle files
15-
}
16-
}
17-
18-
allprojects {
19-
repositories {
20-
google()
21-
mavenCentral()
22-
}
23-
}
24-
25-
task clean(type: Delete) {
26-
delete rootProject.buildDir
2+
plugins {
3+
id 'com.android.application' version '7.4.2' apply false
4+
id 'com.android.library' version '7.4.2' apply false
5+
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
276
}

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-6.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip

settings.gradle

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
pluginManagement {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
gradlePluginPortal()
6+
}
7+
}
8+
dependencyResolutionManagement {
9+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
10+
repositories {
11+
google()
12+
mavenCentral()
13+
}
14+
}
15+
rootProject.name = "Simple xmk"
116
include ':app'
2-
rootProject.name = "Imagine"

0 commit comments

Comments
 (0)