Skip to content

Commit

Permalink
Merge pull request #19 from Kpeved/repo-fix
Browse files Browse the repository at this point in the history
Update Java to 17, gradle from 7.4.2 to 8.0.2
  • Loading branch information
zagum authored Oct 25, 2023
2 parents 8d1cb9e + 88710f4 commit 1c92fd5
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 5 additions & 2 deletions switchicon-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ dependencies {
}

android {
namespace 'com.github.zagum.switchicon.sample'

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

Expand All @@ -21,11 +23,12 @@ android {
vectorDrawables.useSupportLibrary = true
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility 17
targetCompatibility 17
}
buildFeatures {
viewBinding true
buildConfig = true
}
}
repositories {
Expand Down
3 changes: 1 addition & 2 deletions switchicon-sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.github.zagum.switchicon.sample">
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="false"
Expand Down
9 changes: 9 additions & 0 deletions switchicon/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@ dependencies {
}

android {
namespace 'com.github.zagum.switchicon'

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
}
compileOptions {
sourceCompatibility 17
targetCompatibility 17
}
buildFeatures {
buildConfig = true
}
}
repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion switchicon/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<manifest package="com.github.zagum.switchicon">
<manifest>

<application/>

Expand Down

0 comments on commit 1c92fd5

Please sign in to comment.