Fix deps resolution

android · Sep 22, 2023 · 434fc34 · 434fc34
1 parent cef5d9d
commit 434fc34
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 37 deletions.
diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle
@@ -13,12 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-plugins {
-    id 'com.android.application' version "8.1.1" apply false
-    id 'com.android.library' version "8.1.1" apply false
-    id 'org.jetbrains.kotlin.android' version "1.9.10" apply false
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:8.1.1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+    }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+subprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
 }
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -19,11 +19,13 @@ buildscript {
         google()
         mavenCentral()
     }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
+    dependencies {
+        classpath "com.android.tools.build:gradle:8.1.1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+    }
+}
+
 plugins {
-    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id 'com.diffplug.spotless' version '6.21.0'
 }
 

diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -13,10 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+    }
+}
+
 plugins {
-    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id 'com.diffplug.spotless' version '6.21.0'
 }
 

diff --git a/BasicStateCodelab/build.gradle.kts b/BasicStateCodelab/build.gradle.kts
diff --git a/BasicsCodelab/settings.gradle b/BasicsCodelab/settings.gradle
@@ -13,6 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
 
 rootProject.name = "BasicsCodelab"
 include ':app'
diff --git a/...tionCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt b/...tionCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt
@@ -43,8 +43,8 @@ interface GardenPlantingDao {
     fun getPlantedGardens(): LiveData<List<PlantAndGardenPlantings>>
 
     @Insert
-    suspend fun insertGardenPlanting(gardenPlanting: GardenPlanting): Long
+    fun insertGardenPlanting(gardenPlanting: GardenPlanting): Long
 
     @Delete
-    suspend fun deleteGardenPlanting(gardenPlanting: GardenPlanting)
+    fun deleteGardenPlanting(gardenPlanting: GardenPlanting)
 }
diff --git a/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt b/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt
@@ -37,5 +37,5 @@ interface PlantDao {
     fun getPlant(plantId: String): LiveData<Plant>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(plants: List<Plant>)
+    fun insertAll(plants: List<Plant>)
 }