Skip to content

Commit 3576354

Browse files
committed
Upgrade libraries to latest
1 parent 5e89fcd commit 3576354

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

SydneySuburbs/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
android {
9-
compileSdk 32
9+
compileSdk 33
1010

1111
defaultConfig {
1212
minSdk 21
13-
targetSdk 32
13+
targetSdk 33
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
consumerProguardFiles "consumer-rules.pro"
@@ -29,6 +29,7 @@ android {
2929
kotlinOptions {
3030
jvmTarget = '1.8'
3131
}
32+
namespace 'com.vtsen.sydneysuburbs'
3233
}
3334

3435
dependencies {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.vtsen.sydneysuburbs">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
</manifest>

app/build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
}
77

88
android {
9-
compileSdk 32
9+
compileSdk 33
1010

1111
defaultConfig {
1212
applicationId "com.example.simpleandroidlibrary"
1313
minSdk 21
14-
targetSdk 32
14+
targetSdk 33
1515
versionCode 1
1616
versionName "1.0"
1717

@@ -33,33 +33,32 @@ android {
3333
}
3434
kotlinOptions {
3535
jvmTarget = '1.8'
36-
useIR = true
3736
}
3837
buildFeatures {
3938
compose true
4039
}
4140
composeOptions {
4241
kotlinCompilerExtensionVersion compose_version
43-
kotlinCompilerVersion '1.5.21'
4442
}
4543
packagingOptions {
4644
resources {
4745
excludes += '/META-INF/{AL2.0,LGPL2.1}'
4846
}
4947
}
48+
namespace 'com.example.simpleandroidlibrary'
5049
}
5150

5251
dependencies {
5352

54-
implementation 'androidx.core:core-ktx:1.7.0'
55-
implementation 'androidx.appcompat:appcompat:1.4.0'
56-
implementation 'com.google.android.material:material:1.4.0'
53+
implementation 'androidx.core:core-ktx:1.9.0'
54+
implementation 'androidx.appcompat:appcompat:1.5.1'
55+
implementation 'com.google.android.material:material:1.7.0'
5756
implementation "androidx.compose.ui:ui:$compose_version"
5857
implementation "androidx.compose.material:material:$compose_version"
5958
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
60-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
61-
implementation 'androidx.activity:activity-compose:1.4.0'
59+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
60+
implementation 'androidx.activity:activity-compose:1.6.1'
6261

63-
//implementation project(':SydneySuburbs')
64-
implementation 'com.github.vinchamp77:demo-simple-android-lib:0.0.0'
62+
implementation project(':SydneySuburbs')
63+
//implementation 'com.github.vinchamp77:demo-simple-android-lib:0.0.0'
6564
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.simpleandroidlibrary">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"
@@ -12,7 +11,6 @@
1211
<activity
1312
android:name=".MainActivity"
1413
android:exported="true"
15-
android:label="@string/app_name"
1614
android:theme="@style/Theme.SimpleAndroidLibrary.NoActionBar">
1715
<intent-filter>
1816
<action android:name="android.intent.action.MAIN" />

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
ext {
4-
compose_version = '1.0.1'
4+
compose_version = '1.3.0'
55
}
66
repositories {
77
google()
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.1.2'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
11+
classpath 'com.android.tools.build:gradle:7.3.1'
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jan 06 00:18:14 AEDT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)