Merge pull request #19 from Kpeved/repo-fix

Update Java to 17, gradle from 7.4.2 to 8.0.2
zagum · Oct 25, 2023 · 1c92fd5 · 1c92fd5
2 parents 8d1cb9e + 88710f4
commit 1c92fd5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/switchicon-sample/build.gradle b/switchicon-sample/build.gradle
@@ -8,6 +8,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.github.zagum.switchicon.sample'
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
@@ -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 {

diff --git a/switchicon-sample/src/main/AndroidManifest.xml b/switchicon-sample/src/main/AndroidManifest.xml
@@ -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"

diff --git a/switchicon/build.gradle b/switchicon/build.gradle
@@ -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()

diff --git a/switchicon/src/main/AndroidManifest.xml b/switchicon/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="com.github.zagum.switchicon">
+<manifest>
 
   <application/>